Commit Graph

47207 Commits

Author SHA1 Message Date
Usta Shrestha
6eed40aff4 Merge "Removal of unused methods AppendProperties and PrependProperties from topDownMutatorContext" am: fdee90d925 am: 5bdf4a6443
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1909336

Change-Id: I4d0ba9aac39fc754fb09a987b8120ee6c6a5d384
2021-12-03 16:19:15 +00:00
Usta Shrestha
5bdf4a6443 Merge "Removal of unused methods AppendProperties and PrependProperties from topDownMutatorContext" am: fdee90d925
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1909336

Change-Id: Iaccb6df7c660e8f18a8a86a57692638fd20b4be7
2021-12-03 16:02:09 +00:00
Usta Shrestha
fdee90d925 Merge "Removal of unused methods AppendProperties and PrependProperties from topDownMutatorContext" 2021-12-03 15:42:53 +00:00
Yu Liu
cb1a18d8ed Merge "Support filename and sub_dir attributes in sh_binary" am: 0a84e93b7f am: 4c77b9c0c8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1901173

Change-Id: I57392e9313d101aca845605f758048cf3ec5924d
2021-12-03 01:45:42 +00:00
Yu Liu
4c77b9c0c8 Merge "Support filename and sub_dir attributes in sh_binary" am: 0a84e93b7f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1901173

Change-Id: I26e4513bd9cef9ae8c314318ba175b373b4046f3
2021-12-03 01:22:08 +00:00
Yu Liu
0a84e93b7f Merge "Support filename and sub_dir attributes in sh_binary" 2021-12-03 01:04:04 +00:00
Yu Liu
b302455879 Support filename and sub_dir attributes in sh_binary
Test: test by building system/timezone/apex:com.android.tzdata
Change-Id: I08114910fccbdacf6750e237d3e80ba37fde7651
2021-12-02 14:42:20 -08:00
Treehugger Robot
510f16f7c2 Merge "Support response file inputs in build_license_metadata" am: 24eb82416b am: 1309bc53dc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1906350

Change-Id: Icb084f1795e726c3f35aa3097ca2b8ad1343de7d
2021-12-02 22:26:11 +00:00
Treehugger Robot
1309bc53dc Merge "Support response file inputs in build_license_metadata" am: 24eb82416b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1906350

Change-Id: I98e65710ebfece367a007d28320c5e167fa04a52
2021-12-02 22:10:32 +00:00
Treehugger Robot
24eb82416b Merge "Support response file inputs in build_license_metadata" 2021-12-02 21:53:51 +00:00
Usta
355a587e38 Removal of unused methods AppendProperties and PrependProperties from topDownMutatorContext
Test: m nothing
Bug: n/a

Change-Id: Ia37d1c9b96c39603964ba8db2ea6ba52d1138472
2021-12-02 15:21:45 -05:00
Ivan Lozano
e8d9243e38 Merge "rust: Ensure unwind tables are generated" am: cd4335ae45 am: 0035a5efcc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1902270

Change-Id: Id3c89fe125481def9e14022465f9a1d20369cac7
2021-12-02 19:02:17 +00:00
Ivan Lozano
0035a5efcc Merge "rust: Ensure unwind tables are generated" am: cd4335ae45
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1902270

Change-Id: Ic57e5f87ae8f92cb62c687e857b0691bd50ac501
2021-12-02 18:37:41 +00:00
Ivan Lozano
cd4335ae45 Merge "rust: Ensure unwind tables are generated" 2021-12-02 17:39:52 +00:00
Artur Satayev
52545e6cdf Merge "Use textproto format for classpaths.proto generation." am: ee594919ea am: 0b97cf8828
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1907854

Change-Id: Ifa94e180bc796f48740ba64d1010c8a69d5c3951
2021-12-02 16:43:02 +00:00
Liz Kammer
3044f94f32 Merge "Support empty strings in bp2build" am: a9351ef6e6 am: 7cb87525ef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1907331

Change-Id: Ibc459698d24f4c7365844667cd1860a9259943d1
2021-12-02 16:42:43 +00:00
Artur Satayev
0b97cf8828 Merge "Use textproto format for classpaths.proto generation." am: ee594919ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1907854

Change-Id: Ifc20dddb8fa9380423e70be160a81d0b0f545167
2021-12-02 15:58:22 +00:00
Liz Kammer
7cb87525ef Merge "Support empty strings in bp2build" am: a9351ef6e6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1907331

Change-Id: I3b32f0e039a705bcc25233470a09498fefd03bdb
2021-12-02 15:58:13 +00:00
Artur Satayev
ee594919ea Merge "Use textproto format for classpaths.proto generation." 2021-12-02 15:43:47 +00:00
Artur Satayev
f258945ced Merge changes Ieb9aef29,I6985ebb6 am: fb0a7234d7 am: 76ab9442a1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1906590

Change-Id: Iac00e537dd4b893d7437b239b75c30715f532c09
2021-12-02 15:35:59 +00:00
Martin Stjernholm
a1b042e00a Merge changes Ied267053,Ica29c649 am: eca59f3dee am: ee02ef9bd8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1906612

Change-Id: Ie336ff4b58882364b1a6a90ed614a650f815bbdb
2021-12-02 15:35:50 +00:00
Artur Satayev
48fe6ad1cd Merge "Test SdkSpecForm." am: a71eabb705 am: 1fc2cf0ef6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1907852

Change-Id: Ie435486b42c846d0cad7760dafc74ec5783a9d3e
2021-12-02 15:35:29 +00:00
Liz Kammer
a9351ef6e6 Merge "Support empty strings in bp2build" 2021-12-02 15:35:10 +00:00
Artur Satayev
76ab9442a1 Merge changes Ieb9aef29,I6985ebb6 am: fb0a7234d7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1906590

Change-Id: Ifdce50dd6ec0fd4707cab21e96b986d825c65a81
2021-12-02 15:13:45 +00:00
Martin Stjernholm
ee02ef9bd8 Merge changes Ied267053,Ica29c649 am: eca59f3dee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1906612

Change-Id: I0ff75e373495dc5eda36dcf94e158488bcdde846
2021-12-02 15:13:33 +00:00
Artur Satayev
1fc2cf0ef6 Merge "Test SdkSpecForm." am: a71eabb705
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1907852

Change-Id: Ie33a2c35cf7939494a5efecb5139bed3213c92fb
2021-12-02 15:13:07 +00:00
Artur Satayev
fb0a7234d7 Merge changes Ieb9aef29,I6985ebb6
* changes:
  Propagate min and max sdk versions to classpaths.proto configs.
  Introduce max_sdk_version device property.
2021-12-02 14:53:48 +00:00
Martin Stjernholm
eca59f3dee Merge changes Ied267053,Ica29c649
* changes:
  Fix prebuilt header files to produce proper AndroidMk entries.
  Reduce code duplication for testing the two header modules.
2021-12-02 14:50:47 +00:00
Artur Satayev
a71eabb705 Merge "Test SdkSpecForm." 2021-12-02 14:49:21 +00:00
Martin Stjernholm
d51cb5c130 Fix prebuilt header files to produce proper AndroidMk entries.
Necessary for modules that depend on headers through
LOCAL_HEADER_LIBRARIES in legacy Android.mk files.

Test: m nothing
Test: m nothing SOONG_CONFIG_art_module_source_build=false
  on internal master
Test: m droid checkbuild SOONG_CONFIG_art_module_source_build=false
Test: m SOONG_CONFIG_art_module_source_build=false \
        out/soong/.intermediates/prebuilts/module_sdk/art/current/sdk/prebuilt_jni_headers/linux_glibc_x86_64/prebuilt_jni_headers.a
      ar t out/soong/.intermediates/prebuilts/module_sdk/art/current/sdk/prebuilt_jni_headers/linux_glibc_x86_64/prebuilt_jni_headers.a \
        && echo ok
Bug: 202192894
Change-Id: Ied267053d1fc3563870a3faaf41d79983a22815a
2021-12-02 10:54:45 +00:00
Colin Cross
c86a100751 Merge "Only get dexpreopt config for device modules" am: c01a5cd705 am: ceb543994b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1908170

Change-Id: Ic463e0283df718640055aac239bc784f6d0b6ee5
2021-12-02 06:07:57 +00:00
Colin Cross
ceb543994b Merge "Only get dexpreopt config for device modules" am: c01a5cd705
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1908170

Change-Id: I6dd649e6da6300f5e7be78c2760a559b22d7494b
2021-12-02 05:51:14 +00:00
Colin Cross
c01a5cd705 Merge "Only get dexpreopt config for device modules" 2021-12-02 05:28:36 +00:00
Jooyung Han
2db4b4ccdf Merge "Set min_sdk_version (system/core)" am: 3d221b302a am: 3fb87f01f3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899133

Change-Id: I5a533fd3f4457a86c77d5148e8ba559ac8cdab7b
2021-12-02 03:12:48 +00:00
Jooyung Han
3fb87f01f3 Merge "Set min_sdk_version (system/core)" am: 3d221b302a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899133

Change-Id: Id76129b6dfc7faa27d6bd6455c0bab653536070c
2021-12-02 02:49:52 +00:00
Jooyung Han
3d221b302a Merge "Set min_sdk_version (system/core)" 2021-12-02 02:27:20 +00:00
Treehugger Robot
e5d333f7e1 Merge "Add Sh_binaries property" am: abd43ec406 am: eea12c1be9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899131

Change-Id: I59a931f5786f5f49854529880e2296dc3bf5643a
2021-12-02 01:25:07 +00:00
Treehugger Robot
eea12c1be9 Merge "Add Sh_binaries property" am: abd43ec406
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899131

Change-Id: Ib1f905e9492d25ea6040775fe9e788c23b575a7a
2021-12-02 01:08:03 +00:00
Treehugger Robot
abd43ec406 Merge "Add Sh_binaries property" 2021-12-02 00:52:23 +00:00
Treehugger Robot
5f61c406f6 Merge "Adding configuration support for Java 11" am: 5e4637dc1b am: c752b88ca8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1904230

Change-Id: I43283d18fa0871056da8866adb52ba8622a0d253
2021-12-01 22:55:50 +00:00
Treehugger Robot
c752b88ca8 Merge "Adding configuration support for Java 11" am: 5e4637dc1b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1904230

Change-Id: I4a447b98b46c0b2965d3278c458d2cc14a17b9f3
2021-12-01 22:38:58 +00:00
Treehugger Robot
5e4637dc1b Merge "Adding configuration support for Java 11" 2021-12-01 22:18:41 +00:00
Colin Cross
38310bb4ac Only get dexpreopt config for device modules
Calling dexpreopt.GetGlobalConfig can return errors, move the checks
that don't depend on dexpreopt.GetGlobalConfig first to avoid
breaking all modules when the global config is invalid, for example
in a partial branch that is missing the BootProfileImages file.

Bug: 207813628
Test: tradefed branch builds
Change-Id: Id1689de3f1ef986a41a60622cb357edb9d323b8a
2021-12-01 12:32:11 -08:00
Treehugger Robot
0548808f44 Merge "Ignore errors when running df in build_test.bash" am: 7c8497dc36 am: c0d39aef35
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1906865

Change-Id: I272cefb709826451c870defc512aacc1f80ee5e7
2021-12-01 19:19:13 +00:00
Treehugger Robot
c0d39aef35 Merge "Ignore errors when running df in build_test.bash" am: 7c8497dc36
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1906865

Change-Id: If4069f1f8674fc8de528de4ab640052e38790649
2021-12-01 19:07:57 +00:00
Treehugger Robot
7c8497dc36 Merge "Ignore errors when running df in build_test.bash" 2021-12-01 18:53:09 +00:00
Treehugger Robot
1a2224e744 Merge "Revert "Enable hwasan use after scope detection."" am: bc1d8dd659 am: 415f5ebe44
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1907157

Change-Id: Ie21be43afaa4f1a073e9e3837fe861386ff95c6e
2021-12-01 18:49:40 +00:00
Treehugger Robot
415f5ebe44 Merge "Revert "Enable hwasan use after scope detection."" am: bc1d8dd659
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1907157

Change-Id: Ib6910fdffb322a4b18bc5517ecd012c17ffcb85e
2021-12-01 18:31:48 +00:00
satayev
48dae67a76 Use textproto format for classpaths.proto generation.
Test: presubmit
Change-Id: I3fea94153939f05329f02091ca4fa838ee9df93f
2021-12-01 18:24:09 +00:00
Treehugger Robot
bc1d8dd659 Merge "Revert "Enable hwasan use after scope detection."" 2021-12-01 18:13:39 +00:00