Commit Graph

41199 Commits

Author SHA1 Message Date
Dan Willemsen d7ac0198d9 Merge changes from topic "clang_supported"
am: 30f514cc51

Change-Id: Ie6327c5bdeab61452d19284761953acbba1598b7
2017-11-30 08:12:40 +00:00
Dan Willemsen 9be8a79255 Fix / suppress warnings for clang+mingw
am: 25c73e9156

Change-Id: I7f60ee6efc214605c397f91656f7aaf0a76a038d
2017-11-30 08:11:57 +00:00
Dan Willemsen 30f514cc51 Merge changes from topic "clang_supported"
* changes:
  Prepare for clang+mingw windows builds
  Fix / suppress warnings for clang+mingw
2017-11-30 08:05:58 +00:00
Søren Gjesse 896c30a65f Prepare for switching from Proguard to R8
Test: m -j PRODUCT-asop_x86-userdebug
Test: Check that no *.vdex files in the image are generated by R8

Change-Id: Ifd85d485fa5b6148723378a15c5faef849381ce1
2017-11-30 08:34:00 +01:00
Colin Cross 128a35eb66 Merge "Copy soong java prebuilts to classes-pre-proguard.jar" am: b8d6ac2150
am: 2228f62d03

Change-Id: I400fe53a51a7af3ac1b2913868f7abfa43d838b9
2017-11-30 06:35:56 +00:00
Colin Cross 2228f62d03 Merge "Copy soong java prebuilts to classes-pre-proguard.jar"
am: b8d6ac2150

Change-Id: I514048bfcca823269c7473baf17b6b8b2dae0e8d
2017-11-30 06:33:22 +00:00
Treehugger Robot b8d6ac2150 Merge "Copy soong java prebuilts to classes-pre-proguard.jar" 2017-11-30 06:27:21 +00:00
bohu e9046cbbaa emulator: support system-as-root
BUG: 69770927

Test: build sdk_gphone_x86-userdebug, boot up
to home with Tot emulator

Test: build sdk_phone_armv7-userdebug, boot up
to home with Tot emulator

Change-Id: I39348bf35cb748c08ed68a048389bbfc2279a91c
Merged-In: I39348bf35cb748c08ed68a048389bbfc2279a91c
2017-11-29 22:08:28 -08:00
Dan Willemsen c01ad7b384 Prepare for clang+mingw windows builds
Use $(prefix)CLANG_SUPPORTED from Soong to control whether to use clang
for host builds or not. It's fairly general, but I only expect it to be
used to so that Windows builds can be switched between GCC and Clang
with a single switch.

Also separate native-host-cross from native-host so that it's easier to
build all possible windows modules.

Bug: 69933068
Test: m native-host-cross
Test: switch clang on and off, grep w64.*g++ out/build-aosp_arm.ninja
Change-Id: I205c5bc6739b72a539ece935381107ec1dd5bd48
2017-11-29 21:05:48 -08:00
Colin Cross ffa1cc020d Merge "Add support for app prebuilts from soong" am: 9b292d269e
am: 9541ce91c2

Change-Id: Ib161bd82513805d0372c0e8f85b4736933ce14e4
2017-11-30 04:56:19 +00:00
Dan Willemsen 25c73e9156 Fix / suppress warnings for clang+mingw
Switch attribute error to attribute unavailable, which apparently works
since it then broke the build :-/

Suppress unused parameter warnings. They aren't that useful for windows
functions that are just #ifndef WIN32. This is marked as a global cflag,
but something is overriding that with the clang+mingw changes, and it's
not actually that hard to suppress or fix where necessary.

Bug: 69933068
Test: mmma build/tools/libhost
Change-Id: I09adda4544bc9b56452b4fe182dba3d0b701dcbb
2017-11-29 20:54:33 -08:00
Colin Cross 9541ce91c2 Merge "Add support for app prebuilts from soong"
am: 9b292d269e

Change-Id: Ibbee4e2ca76659b4886ea629c6fa1d3b15ae9066
2017-11-30 04:52:43 +00:00
Colin Cross 9b292d269e Merge "Add support for app prebuilts from soong" 2017-11-30 04:49:20 +00:00
Colin Cross 6d0ca1f6cc Copy soong java prebuilts to classes-pre-proguard.jar
Some robolectric rules assume that classes-pre-proguard.jar
exists.  Soong doesn't support proguard yet, so copy classes.jar
to classes-pre-proguard.jar for now.

Bug: 69917341
Test: m checkbuild tests
Change-Id: I818363ec13c2e5e1c4ab5bd6389ea4687de953eb
2017-11-29 20:46:32 -08:00
Colin Cross e05e6df136 Add support for app prebuilts from soong
Allow soong to pass a built app to Make as a prebuilt .apk.

Bug: 69917341
Test: m checkbuild tests docs
Change-Id: I49dbe4c51c5b9f48fb82cb05b8eed7e3fe9fd4f6
2017-11-29 20:46:18 -08:00
Dan Willemsen 142a601bd3 Merge "Switch unused deprecated variables to obsolete" am: f170166521
am: f20b59e4d7

Change-Id: I978c3b5aeb7329e35220648b3f24101e7cf1568b
2017-11-30 02:13:37 +00:00
Dan Willemsen f20b59e4d7 Merge "Switch unused deprecated variables to obsolete"
am: f170166521

Change-Id: Ibe1d991ea61eb953fa161d0e2a04faac1c6309f4
2017-11-30 02:10:49 +00:00
Dan Willemsen f170166521 Merge "Switch unused deprecated variables to obsolete" 2017-11-30 01:49:11 +00:00
Jeff Gaston 6ec6943683 Merge "Export PRODUCT_SOONG_NAMESPACES to Soong" am: 9ddf8ea3a5
am: 4db75cfb63

Change-Id: If3371fb160aea129e4a3c637389f231cc9fffcdc
2017-11-30 00:20:38 +00:00
Jeff Gaston 4db75cfb63 Merge "Export PRODUCT_SOONG_NAMESPACES to Soong"
am: 9ddf8ea3a5

Change-Id: Ia3fe844259d7808477e286b68edbf51e29631e7d
2017-11-30 00:15:32 +00:00
Treehugger Robot 9ddf8ea3a5 Merge "Export PRODUCT_SOONG_NAMESPACES to Soong" 2017-11-29 23:54:29 +00:00
Tianjie Xu 65bee4ee78 Merge "Improve the comment in AddSplitTransfers" am: cca4a4c993
am: 4b57c28908

Change-Id: I7108dd09f0f3f48c84135827cf9a6e190d63d034
2017-11-29 22:01:58 +00:00
Tianjie Xu 4b57c28908 Merge "Improve the comment in AddSplitTransfers"
am: cca4a4c993

Change-Id: I853cd62997a964b91324d079e6940926c889ba6d
2017-11-29 21:57:52 +00:00
Tianjie Xu cca4a4c993 Merge "Improve the comment in AddSplitTransfers" 2017-11-29 21:48:55 +00:00
Dan Willemsen 79fd696939 Switch unused deprecated variables to obsolete
These have no references in our master trees, so can now be marked as
obsolete.

Test: grep -R "<VAR> has been" <all build_test logs>
Change-Id: I72d2371176e78f38ed56741dd8527193eec7eae3
2017-11-29 13:44:32 -08:00
Jeff Gaston 1fe28d332e Export PRODUCT_SOONG_NAMESPACES to Soong
Bug: 65683273
Test: put 'PRODUCT_SOONG_NAMESPACES := jeff-test/dir1' \
      in a .mk file and observe its value copied into \
      out/soong/soong.variables

Change-Id: I2b61caa46f40f35ccecf64da88918b73180e02e8
2017-11-29 13:17:13 -08:00
Kevin Cheng be6e0d066b Merge "Add local compatibilty suite info to module-info.json." am: ada8948b9a
am: 0026cf4d5b

Change-Id: I944e2ddb1a03f349b1678b9c1ce63c4e03ea45e8
2017-11-29 20:38:00 +00:00
Kevin Cheng 0026cf4d5b Merge "Add local compatibilty suite info to module-info.json."
am: ada8948b9a

Change-Id: I6b8c3da9231bf4cb0d3a9aae12e3b0d8e25cef8c
2017-11-29 20:30:47 +00:00
Treehugger Robot ada8948b9a Merge "Add local compatibilty suite info to module-info.json." 2017-11-29 20:20:25 +00:00
Bowgo Tsai d2daa37931 Merge "Reorder assert-max-image-size and AVB signing" am: 8552bebed4
am: 91676f9154

Change-Id: If32fe42e5cddd41664deafb58ccb1c02aa2ee56b
2017-11-29 09:21:09 +00:00
Bowgo Tsai 91676f9154 Merge "Reorder assert-max-image-size and AVB signing"
am: 8552bebed4

Change-Id: I9f8c0e513cee50740b31b26c18e72c9c7284b5c1
2017-11-29 09:17:35 +00:00
Treehugger Robot 8552bebed4 Merge "Reorder assert-max-image-size and AVB signing" 2017-11-29 09:10:27 +00:00
Bowgo Tsai a73ccef1ab Merge "Include vbmeta.img into <product>-img.zip" am: 047aab7c3b -s ours
am: da087e573f  -s ours

Change-Id: Ibb109ecac6d58ef476590447553449b5b1c49bca
2017-11-29 08:39:16 +00:00
Bowgo Tsai da087e573f Merge "Include vbmeta.img into <product>-img.zip"
am: 047aab7c3b  -s ours

Change-Id: Ifa48e48d51ece7354ac1dcef824a5199bd3f8820
2017-11-29 08:34:35 +00:00
Treehugger Robot 047aab7c3b Merge "Include vbmeta.img into <product>-img.zip" 2017-11-29 08:26:24 +00:00
Bowgo Tsai 6a74979a3b Include vbmeta.img into <product>-img.zip
Bug: 65227202
Test: make dist, checks vbmeta.img is included in <product>-img.zip
Merged-In: I3e09f036441bcf7e98d8f76360df1e17466ae38e
Change-Id: I3e09f036441bcf7e98d8f76360df1e17466ae38e
(cherry picked from commit 6bbb11a620)
2017-11-29 16:14:19 +09:00
Michael Schwartz 366ba1e30d Merge "Support prebuilt bootimage" am: 52a4f7d2b7
am: 465197ed16

Change-Id: Ibd6f0f298f78735fd1978a4e7956c5f4aa0e665f
2017-11-29 04:55:54 +00:00
Michael Schwartz 465197ed16 Merge "Support prebuilt bootimage"
am: 52a4f7d2b7

Change-Id: I6f84da11655b151b65c4e3913fc14aa8b6631b97
2017-11-29 04:52:49 +00:00
Treehugger Robot 52a4f7d2b7 Merge "Support prebuilt bootimage" 2017-11-29 04:44:20 +00:00
Dan Willemsen 7aa261d33e Merge "Mark envsetup.sh vars as deprecated in makefiles" am: d7fcf6f459
am: efe230cef6

Change-Id: Icb40e3041e47fe87d7d1a9ee5112a66aa297be55
2017-11-29 03:25:21 +00:00
Dan Willemsen efe230cef6 Merge "Mark envsetup.sh vars as deprecated in makefiles"
am: d7fcf6f459

Change-Id: I7da6187dc23bf7e74dbb7e8b686380070f565f70
2017-11-29 03:18:43 +00:00
Treehugger Robot d7fcf6f459 Merge "Mark envsetup.sh vars as deprecated in makefiles" 2017-11-29 03:06:32 +00:00
Kevin Cheng 2260918434 Add local compatibilty suite info to module-info.json.
Test: m out/target/product/<lunch target>/module-info.json
And I see the following line in module-info.json:

"CtsSampleHostTestCases": { "class": ["JAVA_LIBRARIES"],  "path":
["cts/hostsidetests/sample"],  "tags": ["tests"],  "installed":
["out/host/linux-x86/framework/CtsSampleHostTestCases.jar"],
"compatibility_suites": ["cts",  "general-tests",  "vts"] },

Change-Id: I67a78de4153c762977b145ed62ca8b6ecd0b7947
2017-11-28 15:27:04 -08:00
Jayant Chowdhary 8add887830 Merge "Export DIST_DIR to soong on dist builds." am: 824958e880
am: 26f40c264d

Change-Id: I4c68f459eeee7b34d39d369b2c1e8339c3cb8506
2017-11-28 22:53:28 +00:00
Jayant Chowdhary 26f40c264d Merge "Export DIST_DIR to soong on dist builds."
am: 824958e880

Change-Id: Ic7c2f097e5c19cf80ce3b0b2c6ce170f908907b9
2017-11-28 22:46:56 +00:00
Jayant Chowdhary 824958e880 Merge "Export DIST_DIR to soong on dist builds." 2017-11-28 22:38:32 +00:00
Dan Willemsen 773386251d Mark envsetup.sh vars as deprecated in makefiles
For the envsetup.sh variables that should not be used in makefiles
(since they're not explicitly set up, and won't be available on the
build servers), mark them as deprecated.

Rework our documentation to have a landing page, and create a "Changes"
section where we can record changes like these. At some point I may go
and backfill some recent work.

Test: build/soong/build_test.bash
Change-Id: I54b9294ddf270245afdb58d17150db8098584e8a
2017-11-28 14:19:50 -08:00
Colin Cross f58de03da6 Merge "Add support for jacoco in soong" am: 9798690282
am: 863dcf07d4

Change-Id: I7c8f67093167c75318ef8ba7b0bc86077434f25f
2017-11-28 21:25:23 +00:00
Colin Cross 863dcf07d4 Merge "Add support for jacoco in soong"
am: 9798690282

Change-Id: I47534d7346e637aff019b10bfc395254c618d29c
2017-11-28 21:18:48 +00:00
Colin Cross 9798690282 Merge "Add support for jacoco in soong" 2017-11-28 21:10:57 +00:00