Commit graph

46821 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
satayev
cca4ab762e Propagate min and max sdk versions to classpaths.proto configs.
These attributed define a range for dessert releases where the jars
should be active, and included in corresponding CLASSPATH varibles by
derive_classpath.

Bug: 190818041
Test: presubmit
Change-Id: Ieb9aef29657ad0694d48a63019f93faca2678252
2021-12-01 17:58:41 +00:00
satayev
0a420e771a Introduce max_sdk_version device property.
Artifacts that go into apexes should only be active on certain SDK
versions. There is now a need to upper bound the range to support
expressiong statements like "this jar should only run on platforms
30-31".

Bug: 190818041
Test: presubmit
Change-Id: I6985ebb671841cdd9f0f37f916267ac5ed76e4f4
2021-12-01 17:51:22 +00:00
satayev
0ee2f913ef Test SdkSpecForm.
Bug: 190818041
Test: presubmit
Change-Id: Ib8cd891f03537712d709ed063dd76dee55221118
2021-12-01 17:43:00 +00:00
Cole Faust
fa3431cf37 Ignore errors when running df in build_test.bash
On glinux, df -h prints an "Operation not permitted" error
along with the rest of the output, and exits with status code 1,
causing the rest of the build_test script to not run. Ignore this
error.

Test: Running build_test.bash
Change-Id: I5422d0459ed471671d8d99a883c9ac3fca2e91b8
2021-12-01 08:24:53 -08:00
Martin Stjernholm
611e140043 Reduce code duplication for testing the two header modules.
Preparation for adding more tests to them.

Test: m nothing
Bug: 202192894
Change-Id: Ica29c649c4669e821371fbf8360f437871b7d041
2021-12-01 16:04:34 +00:00
Liz Kammer
46fb7aba4d Support empty strings in bp2build
Previously, could not set an empty string as a value of an attribute;
however, this is necessary in some cases. To not unnecessarily create an
empty string, use string pointers for attributes rather than strings.

Test: go test bp2build tests
Change-Id: I03b3a3567452d455246d22d81f86c317d06b7c39
2021-12-01 10:14:49 -05:00
Benjamin Brittain
9915e2dfc6 Merge "Add support for Rust JNI Libraries" am: 7c721018bb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1906713

Change-Id: Ie71118ee60636b01b3a485af404747a00d6a1272
2021-12-01 14:39:28 +00:00
Benjamin Brittain
7c721018bb Merge "Add support for Rust JNI Libraries" 2021-12-01 14:12:34 +00:00
Jingwen Chen
8e667b8c7f Merge "Move libprotobuf-cpp-full and libprotobuf-cpp-lite to mixed builds denylist." am: a358fdb6f3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1903457

Change-Id: I5ce6066162fb9b6b9342356d778a565043182e8e
2021-12-01 13:49:24 +00:00
Jingwen Chen
a358fdb6f3 Merge "Move libprotobuf-cpp-full and libprotobuf-cpp-lite to mixed builds denylist." 2021-12-01 13:32:27 +00:00
Jiakai Zhang
1d7dad1f09 Merge "Add entries for STANDALONE_SYSTEMSERVER_JARS to systemserverclasspath.pb" am: 2258b889bf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1876173

Change-Id: I17917da17c91a241082c407a2ac893091af540ee
2021-12-01 12:37:48 +00:00
Jiakai Zhang
2258b889bf Merge "Add entries for STANDALONE_SYSTEMSERVER_JARS to systemserverclasspath.pb" 2021-12-01 12:29:37 +00:00
Florian Mayer
77d0035a07 Revert "Enable hwasan use after scope detection."
This reverts commit 753dd32123.

Reason for revert: Broke hwasan postsubmit and https://r.android.com/1906006 does not seem to fix it. Reverting while investigating.

Change-Id: I0033314ac936e7062dc785b3b362ead0b5e9d8f0
2021-12-01 02:31:45 +00:00
Treehugger Robot
4674a20939 Merge "Remove python 2 support from manifest_utils" am: f517a9c631
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1906866

Change-Id: Ie5f5cf0738bf2d215a5937b534a4ddf5856b1160
2021-11-30 22:26:39 +00:00
Treehugger Robot
f517a9c631 Merge "Remove python 2 support from manifest_utils" 2021-11-30 22:12:17 +00:00