Commit Graph

41603 Commits

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

Change-Id: I3b29abe75008c128d8b180f2798cef6184a382c1
2017-11-30 08:20:09 +00:00
Dan Willemsen f4505a095a Fix / suppress warnings for clang+mingw am: 25c73e9156 am: 9be8a79255
am: 215b6bddbe

Change-Id: I6822c72da477cb691b387009e6c3da40af21d12e
2017-11-30 08:19:36 +00:00
Dan Willemsen f5fe7af413 Merge changes from topic "clang_supported" am: 30f514cc51
am: d7ac0198d9

Change-Id: I80095e128b66de0ea5d295e7b4b2e707529bc74e
2017-11-30 08:15:55 +00:00
Dan Willemsen 215b6bddbe Fix / suppress warnings for clang+mingw am: 25c73e9156
am: 9be8a79255

Change-Id: I5a625aa5dcaebd9255cd9b8808ec859a9c672531
2017-11-30 08:15:30 +00:00
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
TreeHugger Robot 0c49bcf16a Merge "Add LOCAL_SDK_VERSION := system_$(VER)" 2017-11-30 06:52:40 +00:00
TreeHugger Robot b4e72d71ae Merge "[Android.bp] soong_config for ARC++" 2017-11-30 06:45:51 +00:00
Colin Cross 41efbd6f10 Merge "Copy soong java prebuilts to classes-pre-proguard.jar" am: b8d6ac2150 am: 2228f62d03
am: 128a35eb66

Change-Id: I43a9239a61c8492a3eb6551acd88bae6f132e26b
2017-11-30 06:38:30 +00: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
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 e5c6b75813 Merge "Add support for app prebuilts from soong" am: 9b292d269e am: 9541ce91c2
am: ffa1cc020d

Change-Id: I1acc7b9e14bc23d30089c26d09cfb321e78551e9
2017-11-30 04:58:26 +00: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
Risan f6c45ce17b [Android.bp] soong_config for ARC++
Test: compile
Bug: 64500663

Change-Id: Id81ea4926b40e739fe16c9c71a9895556a504e9e
2017-11-30 04:19:24 +00:00
Dan Willemsen e3d0b83f76 Merge "Switch unused deprecated variables to obsolete" am: f170166521 am: f20b59e4d7
am: 142a601bd3

Change-Id: I8a6292d13c4a9b8b654830bf3ffff9cf140ea1dc
2017-11-30 02:16:53 +00: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
Sundong Ahn ef212cbe8d Add LOCAL_SDK_VERSION := system_$(VER)
The system_$(VER) can be set in LOCAL_SDK_VERSION, and the apk will use
android_system.jar at build time.
If LOCAL_SDK_VERSION is not defined and this module is installed in
vendor.img, LOCAL_SDK_VERSION is set to system_current.

Bug: 67724799
Test: 1. build && run on taimen
2. LOCAL_SDK_VERSION:=system_27 in ims.apk && build ims.apk && check
the vsdk_v27_intermediates.

Change-Id: I5b11c78b8fcd4a2f2a5e3b141527cd34dbe80018
2017-11-30 10:04:09 +09:00
Jeff Gaston 4eeae43590 Merge "Export PRODUCT_SOONG_NAMESPACES to Soong" am: 9ddf8ea3a5 am: 4db75cfb63
am: 6ec6943683

Change-Id: Idd0824d4e01c6add0fe9083407f3531c5fba7213
2017-11-30 00:38:49 +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 17867754ef Merge "Improve the comment in AddSplitTransfers" am: cca4a4c993 am: 4b57c28908
am: 65bee4ee78

Change-Id: Id74b344092f70d1da29ac3a5c33e3bba75742c5f
2017-11-29 22:07:06 +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 a733c5b3ee Merge "Add local compatibilty suite info to module-info.json." am: ada8948b9a am: 0026cf4d5b
am: be6e0d066b

Change-Id: I6135c3a7c0b0c71038b5a13deb266432578cfb08
2017-11-29 20:50:30 +00: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 17f564ed8d Merge "Reorder assert-max-image-size and AVB signing" am: 8552bebed4 am: 91676f9154
am: d2daa37931

Change-Id: I171fa5e811f0f258e1a07236a9d64e64ce17428a
2017-11-29 09:24:47 +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 63a913d4a7 Merge "Include vbmeta.img into <product>-img.zip" am: 047aab7c3b -s ours am: da087e573f -s ours
am: a73ccef1ab  -s ours

Change-Id: Id0c10bfebb5335b0517198482b2e02f5c6c42df4
2017-11-29 08:43:17 +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