StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,183 Commits 1 Branch 0 Tags
f258945ced341da1f036fb33e59c6fe14355589e
Commit Graph

47183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Benjamin Brittain
f842076481 Merge "Add support for Rust JNI Libraries" am: 7c721018bb am: 9915e2dfc6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1906713

Change-Id: I384b70d42b38d3062890dbe2c078e0f772aa272f
 2021-12-01 15:07:24 +00: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
96e231c96d Merge "Move libprotobuf-cpp-full and libprotobuf-cpp-lite to mixed builds denylist." am: a358fdb6f3 am: 8e667b8c7f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1903457

Change-Id: I9d72c57b0f6ffaa8501b7f78d7b4ebad9769636e
 2021-12-01 14:07:11 +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
0cb50b1036 Merge "Add entries for STANDALONE_SYSTEMSERVER_JARS to systemserverclasspath.pb" am: 2258b889bf am: 1d7dad1f09 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1876173

Change-Id: I3f652c22234c237d05a560c2191db85035c5bc63
 2021-12-01 12:43:17 +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
292c80c755 Merge "Remove python 2 support from manifest_utils" am: f517a9c631 am: 4674a20939 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1906866

Change-Id: I914ed7e32e5bf36ca182705d7cef5b104028fe0c
 2021-11-30 22:37:57 +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
Colin Cross
33efd2114f Merge "Switch default for InstallBypassMake to true" am: 9579f4c05d am: d8c4562f7b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889721

Change-Id: I1ed0c3a8b5b63de3a60bc5f7d91f8e6dc0d8a23b
 2021-11-30 21:02:44 +00:00
Colin Cross
d8c4562f7b Merge "Switch default for InstallBypassMake to true" am: 9579f4c05d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889721

Change-Id: If05a5d88c3e86553936634b75706c2ae167c742f
 2021-11-30 20:47:13 +00:00
Colin Cross
9579f4c05d Merge "Switch default for InstallBypassMake to true" 2021-11-30 20:31:26 +00:00