StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,675 Commits 1 Branch 0 Tags
3c938292450138ca30ac34b38bbd0dcbd313b3b0
Commit Graph

56675 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Duffin
3c93829245 Merge "Allow framework-media to build the framework-media.impl" am: fb14b52747 am: 79c44417b0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2079359

Change-Id: I80bead78c74f6f3335ee68d4138f99868542e46c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:09:02 +00:00
Cole Faust
55253d9842 Merge "Allow seeing include $(x) when there is an include_top comment" am: 16bb2d044d am: b52f187a22 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076911

Change-Id: Ic3e2ef07ec51de8efff01201b5e9752251ebaf34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:08:53 +00:00
Treehugger Robot
746aea81d3 Merge "Convert includes/inherits inside evals" am: e8f19f3dd7 am: c16665bc17 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2073866

Change-Id: I7b975010010eb349e8224f2242ab8d244cff224d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:08:44 +00:00
Kousik Kumar
984051b902 Merge "Add a warning message about missing gcert at the end of the build" am: 4e3c26602f am: e4b4c45bf2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2078459

Change-Id: I3295516fe1b3bc5184628a84f5ef2aad9a2974d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:08:25 +00:00
Cole Faust
50e732e51f Merge "Allow comparing $(wildcard) results to non-empty values" am: 1a3e5effa8 am: a27ee862e2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2075735

Change-Id: I1ed2ad64f656ec08b2b8c4019ba256064056ae96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:07:43 +00:00
Treehugger Robot
bda9d0c994 [automerger skipped] Merge "Set the dist dir for musl targets of build_version_test" am: f7fa021b65 am: 705d009fbb -s ours 
am skip reason: Merged-In I29b7f4c16346e39b89f099eecf816d9811a7b587 with SHA-1 92e3e4fbf6 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2079658

Change-Id: Ie49e586f1b37f85f521b2a4937b79b1bc5a4b33b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:07:30 +00:00
Treehugger Robot
0fe4bd1cfa Merge "Correctly serialize class loader context for "any" SDK version to JSON." am: 1b60bb4fe1 am: 63015df873 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2077659

Change-Id: I79e5a0f919530bf00159e4c6f8b7856ad08287ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:07:10 +00:00
Treehugger Robot
62803617c5 Merge "Replace DEX_FLAGS by flags for D8 and R8." am: d5a57a5679 am: 1b50e80f92 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2059767

Change-Id: I6843e40400b06f971ce2f5d152d667774f5f603d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:05:04 +00:00
Ulya Trofimovich
340fa7cca8 Merge "Remove obsolete dexpreopt config option UseArtImage." am: a465e28bcb am: c58470bc37 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2069027

Change-Id: I715de13e60f746c9e5be2433116a727783af9007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:04:44 +00:00
Paul Duffin
79c44417b0 Merge "Allow framework-media to build the framework-media.impl" am: fb14b52747 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2079359

Change-Id: If34a3316c996a40ca0390b3858e589e85681e925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 17:59:55 +00:00
Paul Duffin
fb14b52747 Merge "Allow framework-media to build the framework-media.impl" 2022-04-28 21:10:16 +00:00
Cole Faust
b52f187a22 Merge "Allow seeing include $(x) when there is an include_top comment" am: 16bb2d044d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076911

Change-Id: Ie6a0c47b3fc54b4779da621c4eba16ae169e0074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:50:45 +00:00
Treehugger Robot
c16665bc17 Merge "Convert includes/inherits inside evals" am: e8f19f3dd7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2073866

Change-Id: I05fe227917386a325f86f83a70b80f404bf4eab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:50:34 +00:00
Cole Faust
16bb2d044d Merge "Allow seeing include $(x) when there is an include_top comment" 2022-04-28 20:49:17 +00:00
Treehugger Robot
e8f19f3dd7 Merge "Convert includes/inherits inside evals" 2022-04-28 20:43:29 +00:00
Kousik Kumar
e4b4c45bf2 Merge "Add a warning message about missing gcert at the end of the build" am: 4e3c26602f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2078459

Change-Id: I8274f0a1602d86d896ebebafa03635c4618647d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:40:57 +00:00
Cole Faust
a27ee862e2 Merge "Allow comparing $(wildcard) results to non-empty values" am: 1a3e5effa8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2075735

Change-Id: I10f1ed3fc07de5ca14640a877801107a2cb9184b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:40:36 +00:00
Kousik Kumar
4e3c26602f Merge "Add a warning message about missing gcert at the end of the build" 2022-04-28 19:55:30 +00:00
Cole Faust
1a3e5effa8 Merge "Allow comparing $(wildcard) results to non-empty values" 2022-04-28 19:54:32 +00:00
Treehugger Robot
705d009fbb Merge "Set the dist dir for musl targets of build_version_test" am: f7fa021b65 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2079658

Change-Id: Id1cbde34a306e9b2b120a3b198cb1442ab736cc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 16:58:46 +00:00
Treehugger Robot
63015df873 Merge "Correctly serialize class loader context for "any" SDK version to JSON." am: 1b60bb4fe1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2077659

Change-Id: I7ee478d26bb7741a6d75a8ba0f668a3d9bb8622f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 16:58:05 +00:00
Treehugger Robot
f7fa021b65 Merge "Set the dist dir for musl targets of build_version_test" 2022-04-28 16:51:24 +00:00
Treehugger Robot
1b60bb4fe1 Merge "Correctly serialize class loader context for "any" SDK version to JSON." 2022-04-28 15:46:04 +00:00
Paul Duffin
77590a8263 Allow framework-media to build the framework-media.impl 
The framework-media java_sdk_library is currently api_only for legacy
reasons. This change allows it to also build the framework-media.impl
library by making the following changes:
* Adds impl_only_static_libs to allow the implementation to statically
  include other libraries, something no other java_sdk_library has
  needed to do.
* Passes the apex_availability property through to the impl library so
  it can be statically included in the updatable-media which is what is
  included in the apex, again for legacy reasons.

Bug: 190807367
Bug: 229932396
Test: m com.android.media media-module-sdk
      # Compare before and after this change (and corresponding change
      # to updatable-media/framework-media.
Change-Id: I9e1837edcca6f5fa84fc611274cf8fbba8a896b8
 2022-04-28 14:30:14 +00:00
Oriol Prieto Gasco
eda12cb250 Set the dist dir for musl targets of build_version_test 
Bug: 230604501
Test: build/soong/soong_ui.bash --make-mode apexer_tools static_apexer_tools dist BUILD_HOST_static=1 USE_HOST_MUSL=true
Change-Id: I29b7f4c16346e39b89f099eecf816d9811a7b587
Merged-In: I29b7f4c16346e39b89f099eecf816d9811a7b587
 2022-04-28 14:18:59 +00:00
Treehugger Robot
1b50e80f92 Merge "Replace DEX_FLAGS by flags for D8 and R8." am: d5a57a5679 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2059767

Change-Id: I43703b2d2fbbdfe5094c8d1a396789d985e61fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 13:12:18 +00:00
Oriol Prieto Gasco
d6db5357e6 Merge "Set the dist dir for musl targets of build_version_test" into tm-dev am: 557e3fa4a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/17982168

Change-Id: Iee4b398f715ae6c39b1d244b9fdad618190647a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 13:11:45 +00:00
Treehugger Robot
d5a57a5679 Merge "Replace DEX_FLAGS by flags for D8 and R8." 2022-04-28 12:40:13 +00:00
Ulya Trafimovich
91f015e73e Correctly serialize class loader context for "any" SDK version to JSON. 
Previously "any" was serialized as its numeric value, 10000. But other
code in makefiles and scripts expects string "any", and dexpreopt.config
files generated by Make (for Android.mk modules) have "any" not 10000.

Bug: 214255490
Test: lunch aosp_cf_x86_64_phone-userdebug && m && launch_cvd \
    && adb wait-for-device && adb root \
    && adb logcat | grep -E 'ClassLoaderContext [a-z ]+ mismatch'
    # empty output, no errors at boot
Change-Id: Id5e80eb8a90d9786b5cb999c172aaecb44952f76
 2022-04-28 13:22:52 +01:00
Oriol Prieto Gasco
557e3fa4a6 Merge "Set the dist dir for musl targets of build_version_test" into tm-dev 2022-04-28 12:17:41 +00:00
Ulya Trofimovich
c58470bc37 Merge "Remove obsolete dexpreopt config option UseArtImage." am: a465e28bcb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2069027

Change-Id: I4713930b22cd10ab83d10472ee86600bbec2d249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 10:09:03 +00:00
Ulya Trofimovich
a465e28bcb Merge "Remove obsolete dexpreopt config option UseArtImage." 2022-04-28 09:44:21 +00:00
Treehugger Robot
35e5179349 Merge "Fix erroneous "Field requires API level 33 (current min is 32)" warnings" am: fcf0b686aa am: 587f8c3425 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2072628

Change-Id: I7cc60174e9e525181cbf51dfd20e2e3e89f5c241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:30:58 +00:00
TreeHugger Robot
d8715db0ae Merge "Bump minimum minSdkVersion to 19." into tm-dev am: 8fc3fa09fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/17944288

Change-Id: I375e255065bdc20f7116e08a77cfef1448fdbcc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:13:13 +00:00
Treehugger Robot
587f8c3425 Merge "Fix erroneous "Field requires API level 33 (current min is 32)" warnings" am: fcf0b686aa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2072628

Change-Id: I58c5e93cf87d607289991e18f1478cc6ef04484f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:12:57 +00:00
Treehugger Robot
fcf0b686aa Merge "Fix erroneous "Field requires API level 33 (current min is 32)" warnings" 2022-04-27 22:10:36 +00:00
TreeHugger Robot
8fc3fa09fa Merge "Bump minimum minSdkVersion to 19." into tm-dev 2022-04-27 22:05:18 +00:00
Trevor Radcliffe
9fb1e99a08 Merge "Refactor cc/bp2build.go to use parse helper" am: 4dc57a6d7b am: 2ca964ecda 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2072288

Change-Id: Iccb0fbd53e97bf6ecec7e01d720ca0ceb5fb76a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:00:51 +00:00
Cole Faust
8b7f627f30 Fix erroneous "Field requires API level 33 (current min is 32)" warnings 
Bug: 215567981
Bug: 204776549
Test: m out/soong/.intermediates/frameworks/base/framework-minus-apex/android_common/lint/lint-report.xml, then check that that file doesn't have any of these warnings
Change-Id: I39aa2228474630c93250bf5833ac6bd9bbadcc7f
 2022-04-27 12:20:08 -07:00
Kousik Kumar
b018b83664 Add a warning message about missing gcert at the end of the build 
Now that we are ready to rollout gcert, adding a warning that builds
will fail if gcert doesn't exist. Doing this only for builds with
ANDROID_BUILD_ENVIRONMENT_CONFIG=googler.

Test: Ran a build without gcert and USE_RBE=true and it printed the
warning.
Bug: b/229743321

Change-Id: I616a4a534ab277873ac7e19baecb78620f07854c
 2022-04-27 15:16:41 -04:00
Trevor Radcliffe
2ca964ecda Merge "Refactor cc/bp2build.go to use parse helper" am: 4dc57a6d7b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2072288

Change-Id: Ib5980bf23cea4f8663da6c665c50dea288805d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 19:10:20 +00:00
Trevor Radcliffe
4dc57a6d7b Merge "Refactor cc/bp2build.go to use parse helper" 2022-04-27 18:40:00 +00:00
Cole Faust
e4783cac3e Merge "Ignore assignments to .KATI_READONLY" am: a59059f3a1 am: dcc5e4c832 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076913

Change-Id: I08b95673fe8e890effad8be65a56074a1f7c15f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:38:04 +00:00
Liz Kammer
d71a590b75 Merge "Delete some unused functions." am: eb5fc70c7b am: 7df48d0702 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2075898

Change-Id: Ie321a52c68529813f5f07e485e3b9055d1b7ec6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:37:17 +00:00
Cole Faust
dcc5e4c832 Merge "Ignore assignments to .KATI_READONLY" am: a59059f3a1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076913

Change-Id: Ic3c1e38c2139aea9d7255abc4e54eeb0dbe7a9bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:01:24 +00:00
Liz Kammer
7df48d0702 Merge "Delete some unused functions." am: eb5fc70c7b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2075898

Change-Id: Ibc87c660a4cf639216ba60c0b9cd24954d327924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:01:14 +00:00
Cole Faust
a59059f3a1 Merge "Ignore assignments to .KATI_READONLY" 2022-04-27 17:56:54 +00:00
Muhammad Haseeb Ahmad
809cd79d01 Merge "Add jni support to java_fuzz_host" am: 4e70b7586a am: 5b63f52025 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2045705

Change-Id: I3b9da743e9cf88e8defdb6610630e37a8bfa46b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 17:56:23 +00:00
Treehugger Robot
7aa2ab4257 Merge "Share CreateModule between hooks & mutators" am: 60fe34a79d am: 37ce89c599 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2075728

Change-Id: I180f522c5fd7bef9fd6bcff2af9ee9aa5a2f7dad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 17:53:12 +00:00
Treehugger Robot
f7814a1ccb Merge "Deduplicate classLoaderContexts field between two structs." am: b3f437ae7b am: 5c02379a49 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2077658

Change-Id: I5f74c22213d7b84b5d1c2fefff18e26d1285384f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 17:53:01 +00:00