Commit Graph

11315 Commits

Author SHA1 Message Date
Colin Cross 8b5532fa64 Merge "Export variable for device sanitize arch to Soong" am: d778640b0f am: 81e759e842
am: 168ff79efc

Change-Id: I3b14c8b2c2a057110ec0e88b91a4b9ba6bffe63d
2016-11-03 07:24:26 +00:00
Colin Cross 168ff79efc Merge "Export variable for device sanitize arch to Soong" am: d778640b0f
am: 81e759e842

Change-Id: I31e391e46e407359ea3c1dc4875839d0c38b2b6c
2016-11-03 07:21:27 +00:00
Colin Cross 81e759e842 Merge "Export variable for device sanitize arch to Soong"
am: d778640b0f

Change-Id: I2e98bdc476179ad990c2a3294fb6c7f56b21115f
2016-11-03 07:18:27 +00:00
Treehugger Robot d778640b0f Merge "Export variable for device sanitize arch to Soong" 2016-11-03 07:12:54 +00:00
Ian Pedowitz 44d7414953 DO NOT MERGE Nougat MR2 is 7.1.2
am: 61be03b456

Change-Id: I10e090618d1342d03296f1345fabd1dfb4d94117
2016-11-03 06:52:14 +00:00
Dan Willemsen c10172ef9c Merge "Update combined build.ninja to depend on Soong's build.ninja" am: 77ecb3347b
am: b4b655a7af

Change-Id: I0867e0d6402f95b04a034148562d731869f2a622
2016-11-03 02:48:11 +00:00
Dan Willemsen b4b655a7af Merge "Update combined build.ninja to depend on Soong's build.ninja"
am: 77ecb3347b

Change-Id: Ia9520db5e535a290d713ce87e3dcba73be7327d7
2016-11-03 02:45:12 +00:00
Dan Willemsen d4b0504f85 Update combined build.ninja to depend on Soong's build.ninja
For Soong's build.ninja regeneration to work

Bug: 32574042
Test: m -j, add globbed file, m -j
Change-Id: Ie267ea33e8de88275e99330b2d0f147d1e58fa7b
2016-11-02 16:24:52 -07:00
Colin Cross 2361842291 Export variable for device sanitize arch to Soong
Also renames the variable from SANITIZE_ARCH to SANITIZE_TARGET_ARCH,
and makes it only apply to the device.

Bug: 29498013
Test: No change to build.ninja files with m -j SANITIZE_TARGET=address
Change-Id: Ib5f6ab448f5d96d2426c983308136670f9a55b7b
2016-11-02 15:20:25 -07:00
Ian Pedowitz 61be03b456 DO NOT MERGE Nougat MR2 is 7.1.2
Fixes: 32335870
Change-Id: I2b0f7e0f9506704a391930f6f9c2a4cf9c550a7f
2016-11-01 14:42:43 -07:00
Dan Willemsen 9e7c127da2 Merge "Remove configuration exported from Soong" am: b1e0c2c478
am: c70f550338

Change-Id: I71fd3c40a51074684dde3442c090b1f5992627f3
2016-11-01 17:28:33 +00:00
Dan Willemsen c70f550338 Merge "Remove configuration exported from Soong"
am: b1e0c2c478

Change-Id: I4674044e2dce477fa9ad747eebe8daa1b7824c38
2016-11-01 17:23:59 +00:00
Dan Willemsen b1e0c2c478 Merge "Remove configuration exported from Soong" 2016-11-01 17:07:54 +00:00
Dan Willemsen a73da56314 Merge "Pass global tidy configuration to Soong" am: ca5748fbe1
am: cb4f1fa3db

Change-Id: I8130ffb692bc913549d747047d41929099d29c3e
2016-11-01 01:24:52 +00:00
Dan Willemsen cb4f1fa3db Merge "Pass global tidy configuration to Soong"
am: ca5748fbe1

Change-Id: I69e7e5bf9960025febafe0bafa746b650718283c
2016-11-01 01:22:21 +00:00
Treehugger Robot ca5748fbe1 Merge "Pass global tidy configuration to Soong" 2016-11-01 01:19:00 +00:00
Dan Willemsen 371c403fa8 Merge "Improve dotdot workaround when src begins with '/'" am: 7918e5121a
am: 05b0da9441

Change-Id: Iefac888b97477ce1a5479a5a931108dcfe229aa3
2016-10-31 23:45:14 +00:00
Dan Willemsen 05b0da9441 Merge "Improve dotdot workaround when src begins with '/'"
am: 7918e5121a

Change-Id: I049e8fa30b713f3aceeb1ca579e2550f22c4a10d
2016-10-31 23:42:43 +00:00
Dan Willemsen 7918e5121a Merge "Improve dotdot workaround when src begins with '/'" 2016-10-31 23:39:36 +00:00
Dan Willemsen 425130e958 Remove configuration exported from Soong
Bug: 32244182
Test: build-aosp_angler.ninja is identical before/after (with same env)
Change-Id: Iec2784d1ec5301afe4e2de491dee806551ae3764
2016-10-31 15:48:00 -07:00
Dan Willemsen 96290686bf Pass global tidy configuration to Soong
Bug: 32244182
Test: WITH_TIDY=true mmma -j build/kati
Test: WITH_TIDY=true WITH_TIDY_CHECKS=-*,performance* mmma -j build/kati
Change-Id: Idca86bd114f353449bf80f73d255d7095a99682a
2016-10-31 15:47:49 -07:00
Colin Cross b90bd1c6f9 Merge "Revert "Revert "Check prebuilt sources during checkbuild""" am: 515f43bb6e
am: e402dd8bb8

Change-Id: I2f8ff970f777382b3e60c34268525ab139ee39f5
2016-10-30 22:20:53 +00:00
Colin Cross e402dd8bb8 Merge "Revert "Revert "Check prebuilt sources during checkbuild"""
am: 515f43bb6e

Change-Id: Ia749b34011e02df8ceb9d0fe0e4aba34da743cb1
2016-10-30 22:14:23 +00:00
Colin Cross 515f43bb6e Merge "Revert "Revert "Check prebuilt sources during checkbuild""" 2016-10-30 22:05:17 +00:00
Dan Willemsen c57894c204 Improve dotdot workaround when src begins with '/'
There are some source files in our tree that use some text processing to
find source files, and end up with source file names that look like:

  /../../dir/file.c

This isn't fixed by our dotdot workarounds because the filename doesn't
start with '../', so strip the initial '/' from any source files, since
they are all relative to $(LOCAL_PATH) anyways.

Bug: 32514380
Test: Build internal source with this problem
Test: Compare build-aosp_angler.ninja before/after
Change-Id: If869419c3d3ba35d55f6e19d9332515695e47d24
2016-10-28 16:30:48 -07:00
Colin Cross 01e1b8ff4b Revert "Revert "Check prebuilt sources during checkbuild""
This reverts commit 409ea88c47.

Bug: 32332829
Change-Id: Ifc8a511762cb44b455cc821f5ac712c294c321c6
2016-10-27 22:10:55 +00:00
Sasha Levitskiy c63565970c build: tools: Add json collection of installed files with hashes.
am: 3c97fa78cd

Change-Id: I5eb12808bbb82a4b9aeaa76b32d971ee4d2643ba
2016-10-27 20:56:44 +00:00
Colin Cross 8a1ccefa2b Merge "Revert "Check prebuilt sources during checkbuild"" am: 526ddfb172
am: 96fdb76947

Change-Id: I86cb42e00027103cf43709bcbd129d8682b0d3b2
2016-10-26 23:37:16 +00:00
Colin Cross 96fdb76947 Merge "Revert "Check prebuilt sources during checkbuild""
am: 526ddfb172

Change-Id: I2bd28f5b35b27e2339eb2952b9e3acdd6a470773
2016-10-26 23:32:47 +00:00
Colin Cross 526ddfb172 Merge "Revert "Check prebuilt sources during checkbuild"" 2016-10-26 23:26:43 +00:00
Colin Cross 409ea88c47 Revert "Check prebuilt sources during checkbuild"
This reverts commit ec8fae6f2e.

Revert this until a few oddball branches can be fixed.

Bug: 32332829
Change-Id: Ic95fa50e36cb32a4d29bf765b1f3d8384140fb0b
2016-10-26 23:25:57 +00:00
Colin Cross d260bf7c03 Merge "Check prebuilt sources during checkbuild" am: 0f26c64ef5
am: 84ba353fd1

Change-Id: I1da642cf09247b9f02e4beb8369b8428bf823bae
2016-10-26 19:50:47 +00:00
Colin Cross 84ba353fd1 Merge "Check prebuilt sources during checkbuild"
am: 0f26c64ef5

Change-Id: I961221a3e7cdcd00ea4dcbb1c88a36f138962113
2016-10-26 19:47:57 +00:00
Colin Cross 0f26c64ef5 Merge "Check prebuilt sources during checkbuild" 2016-10-26 19:35:32 +00:00
Pirama Arumuga Nainar 9570b53f9c Merge "RenderScript-specific build updates for LLVM rebase" am: 9e73fb6332
am: 97f259ec41

Change-Id: I8d5860fd4e2f478f973ce153fb18f3f785e408c3
2016-10-26 17:52:57 +00:00
Pirama Arumuga Nainar 97f259ec41 Merge "RenderScript-specific build updates for LLVM rebase"
am: 9e73fb6332

Change-Id: Ib0154409699b27ba1e651aefc5559d094aa53635
2016-10-26 17:41:44 +00:00
Pirama Arumuga Nainar 08df240f94 RenderScript-specific build updates for LLVM rebase
Bug: http://b/31320715

Use LLVM's RenderScript triples: upstream LLVM now has 32-bit and
64-bit RenderScript triples.  Update RS_TRIPLE build variables to use
the new triples.

Switch prebuilt clang used for building RenderScript runtime library to
the latest prebuilts.

Test: Run RenderScript tests (slang, bcc host tests, RsTest, CTS)

Change-Id: I308f6a2183350cfc380228a1eed07ec118d93a46
2016-10-25 09:35:26 -07:00
Dan Willemsen 083a6303c0 Merge "Cleanup NATIVE_COVERAGE, PRIVATE_ARFLAGS" am: fce41130cc
am: 79feb28724

Change-Id: I2a6d3ae69e67bf3f7849b11695b33165315f9aab
2016-10-22 03:09:03 +00:00
Dan Willemsen 79feb28724 Merge "Cleanup NATIVE_COVERAGE, PRIVATE_ARFLAGS"
am: fce41130cc

Change-Id: Id6a7fe68355d1e672cd00b5657b10db00445be39
2016-10-22 03:06:32 +00:00
Treehugger Robot fce41130cc Merge "Cleanup NATIVE_COVERAGE, PRIVATE_ARFLAGS" 2016-10-22 03:02:52 +00:00
Colin Cross ec8fae6f2e Check prebuilt sources during checkbuild
Add prebuilt files as dependencies during checkbuild.  This will flag
prebuilt modules that have files that don't exist as errors, and also
fix building soong modules with make native, etc.

Bug: 32332829
Test: m -j checkbuild
Test: m -j host
Change-Id: Ia4e22cb640978c181de039202baf02f4fb5a94d5
2016-10-22 00:00:40 +00:00
Dan Willemsen 9f95665022 Cleanup NATIVE_COVERAGE, PRIVATE_ARFLAGS
Disable the NATIVE_COVERAGE code when not in use. Provide the proper
PRIVATE_ variables so that the $DISPLAY environment variable isn't
encoded into the ninja file.

Remove PRIVATE_ARFLAGS, which is never set.

Test: compare build-aosp_flounder.ninja
Test: NATIVE_COVERAGE=true build-aosp_flounder.ninja, inspect
Change-Id: I2a52de440fd991cdc5761ff8bd58a474892d2dfc
2016-10-21 16:40:19 -07:00
Colin Cross 4db457e030 Merge "Don't pass -Wl,--no-undefined to host targets" am: fe3e1818e5
am: 44d966cf6a

Change-Id: Ibbc6d1e83fb8f7ab32fef86c43ea30700f853815
2016-10-21 23:12:26 +00:00
Colin Cross 44d966cf6a Merge "Don't pass -Wl,--no-undefined to host targets"
am: fe3e1818e5

Change-Id: Ic6635ee93ef979c00f3925b852f853bea53a0a61
2016-10-21 23:07:24 +00:00
Treehugger Robot fe3e1818e5 Merge "Don't pass -Wl,--no-undefined to host targets" 2016-10-21 23:00:35 +00:00
Jakub Adamek bfc95a2843 Change name of overlay subdir 'sku'->'theme'
am: 3451f2454a

Change-Id: I2b7fe625d96a540cb113d7b0f76848a9e2864d66
2016-10-21 07:04:15 +00:00
Flavio Lerda cdb1499198 Merge "Change name of overlay subdir 'sku'->'theme'" into cw-f-dev 2016-10-21 06:32:18 +00:00
Chih-hung Hsieh 10620907bb Merge "Remove valgrind from the exception list." am: 461a15d0d9
am: c9f8b3faeb

Change-Id: If59fcaabad22c5aa70949faee5e6b50c361a3d7b
2016-10-21 05:27:40 +00:00
Chih-hung Hsieh c9f8b3faeb Merge "Remove valgrind from the exception list."
am: 461a15d0d9

Change-Id: I237c0d71c037e1ecb6ebe3f36bd6aa7e52de18fe
2016-10-21 05:18:39 +00:00
Chih-hung Hsieh 461a15d0d9 Merge "Remove valgrind from the exception list." 2016-10-21 05:05:30 +00:00