StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,340 Commits 1 Branch 0 Tags
ef6fe1bc468f1479fcbefc706aad102a4609bb0c
Commit Graph

3661 Commits

Author SHA1 Message Date
Anton Hansson
ef6fe1bc46 Merge "Fix prebuilt_apis creating of "latest" incompatibilities" am: b0d0710f67 am: ebf442153d am: e879d64cf8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1558554

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf7de9ca813ba773542823482e5287e91cf71c30
 2021-01-28 17:15:16 +00:00
Paul Duffin
b523679051 Merge "Add boot_image module type" am: b9d731c8a9 am: 70b8c656c6 am: e36b8727c1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1556240

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b3eea987e3cc9ec6106b9a8f250b8616d5c4589
 2021-01-28 17:13:03 +00:00
Anton Hansson
e879d64cf8 Merge "Fix prebuilt_apis creating of "latest" incompatibilities" am: b0d0710f67 am: ebf442153d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1558554

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4c4293da87ba27b18d7cd4107f907f44db14ae9
 2021-01-28 17:00:51 +00:00
Paul Duffin
e36b8727c1 Merge "Add boot_image module type" am: b9d731c8a9 am: 70b8c656c6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1556240

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06be6aab301bb86e24e253fa7b6d94cba258b02a
 2021-01-28 16:48:30 +00:00
Anton Hansson
b0d0710f67 Merge "Fix prebuilt_apis creating of "latest" incompatibilities" 2021-01-28 16:48:16 +00:00
Anton Hansson
20ce41d0b9 Fix prebuilt_apis creating of "latest" incompatibilities 
Incompatibilities are a bit special in that we only ever want to use
the "latest" if it is for a non-finalized SDK.

Add a new argument, next_api_dir, and use only those files to create
"latest incompatibilities". Create empty incompatibilities for all
modules not in next_api_dir.

Bug: 178171189
Test: m
Change-Id: I727a52e3a45a5e607c6176d481b40fbf495c6eb0
 2021-01-26 18:08:19 +00:00
Paul Duffin
650553e343 Merge "Make dexpreopt tools available for all java tests" am: 4c183c7581 am: ca6d1d9267 am: eef33b4e93 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1556241

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I304e79170ba080e4c7221d31d53726cb43714d03
 2021-01-26 13:37:21 +00:00
Paul Duffin
3451e1600f Add boot_image module type 
Adds a boot_image module type. Follow on changes will add instances of
boot_image to represent the ART and framework boot images in the art
and frameworks/base repositories respectively.

For the moment they retrieve their associated boot image configuration
from the map returned by genBootImageConfigs() and leave the actual
work of creating the ninja rules to create the boot images to the
dex_bootjars singleton.

Bug: 177892522
Test: m droid
Change-Id: Ib69701de0d24d996bb8e8be7a20b941be907390e
 2021-01-26 13:00:07 +00:00
Paul Duffin
eef33b4e93 Merge "Make dexpreopt tools available for all java tests" am: 4c183c7581 am: ca6d1d9267 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1556241

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33f4184727ea3781e96bd07ae0f32188ab3e08cf
 2021-01-26 12:56:08 +00:00
Paul Duffin
4c183c7581 Merge "Make dexpreopt tools available for all java tests" 2021-01-26 12:08:30 +00:00
Paul Duffin
635aa0834f Make dexpreopt tools available for all java tests 
Bug: 177892522
Test: m nothing
Change-Id: I594bddae692ef76dc8c3da504934d0151b13d4c9
 2021-01-25 19:15:19 +00:00
Anton Hansson
77b715765f Merge "Minor cleanup in prebuilt_apis" am: 172f58b63b am: 80450686ca am: 1a441b417a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1558553

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48dc8e12ca81c226524600aced26791b00e2ba12
 2021-01-25 16:45:51 +00:00
Anton Hansson
1a441b417a Merge "Minor cleanup in prebuilt_apis" am: 172f58b63b am: 80450686ca 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1558553

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3508884240819cad4e992f107e2313081c7870ac
 2021-01-25 16:32:22 +00:00
Anton Hansson
370fd0b050 Minor cleanup in prebuilt_apis 
Use ints instead of strings for version comparison.

Bug: 178171189
Test: m
Change-Id: I53d71b138a64b902b3f00adafec5d354630a5e35
 2021-01-25 10:58:41 +00:00
Paul Duffin
d7ea4cd3f5 Merge "Switch dex_bootjars to a singleton module" am: 98325717b1 am: 4f6ac795dc am: e0b2bbbc29 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555159

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I698251d7cec6e5613244367432c69d3efbd11fec
 2021-01-22 19:19:18 +00:00
Paul Duffin
31c9004996 Merge "Allow createGlobalSoongConfig() to be used from tests" am: 8479ea296d am: 64b8cd1b52 am: 75ae5a3dc9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1556577

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib39cce4349a982ed80304e5ad25c67e0f08c16a9
 2021-01-22 19:19:01 +00:00
Paul Duffin
068fb3d885 Merge "Add java.RegisterRequiredBuildComponentsForTest function" am: c44075b710 am: 398ab4e8c5 am: 465c9c034f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555158

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83e74ee100868f97303906ed6a1621d5dfd7149b
 2021-01-22 19:18:02 +00:00
Paul Duffin
e0b2bbbc29 Merge "Switch dex_bootjars to a singleton module" am: 98325717b1 am: 4f6ac795dc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555159

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifce4c47789007d56c6c73ed4025a2427f1b8bb01
 2021-01-22 18:45:56 +00:00
Paul Duffin
75ae5a3dc9 Merge "Allow createGlobalSoongConfig() to be used from tests" am: 8479ea296d am: 64b8cd1b52 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1556577

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d8189912ea8fcb54950821119fe0583ceacca83
 2021-01-22 18:45:48 +00:00
Paul Duffin
465c9c034f Merge "Add java.RegisterRequiredBuildComponentsForTest function" am: c44075b710 am: 398ab4e8c5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555158

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5c8a2641d1c670c024622a94b8ecda6b09539a2
 2021-01-22 18:45:21 +00:00
Paul Duffin
98325717b1 Merge "Switch dex_bootjars to a singleton module" 2021-01-22 17:42:54 +00:00
Paul Duffin
8479ea296d Merge "Allow createGlobalSoongConfig() to be used from tests" 2021-01-22 17:42:00 +00:00
Paul Duffin
c44075b710 Merge "Add java.RegisterRequiredBuildComponentsForTest function" 2021-01-22 17:41:02 +00:00
Anton Hansson
880cb13323 Merge "Add a better error message for missing api files" am: 4de3c42c73 am: 54431da641 am: 842d34ac7b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555156

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4072a0dc145efbc3e1968cadd32656b8d2efccf1
 2021-01-22 12:06:29 +00:00
Anton Hansson
842d34ac7b Merge "Add a better error message for missing api files" am: 4de3c42c73 am: 54431da641 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555156

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1bfaf36ad15e2c771872fd80dc31d750cdeeffe0
 2021-01-22 11:52:47 +00:00
Anton Hansson
4de3c42c73 Merge "Add a better error message for missing api files" 2021-01-22 10:31:15 +00:00
Paul Duffin
1ab6186e91 Switch dex_bootjars to a singleton module 
The main difference between a singleton and a singleton module that
affects this change is that the latter requires a module to be defined
in order for the singleton to be instantiated. This change defines the
module in both the tests and the standard build.

Bug: 177892522
Test: m droid
Change-Id: Id6669835cf3a2ab7359fa53047eb9042992a9362
 2021-01-21 16:49:34 +00:00
Paul Duffin
9f04524673 Allow createGlobalSoongConfig() to be used from tests 
Previously, the createGlobalSoongConfig() function was explicitly
prevented from being used in tests because it would fail. However, it
turns out that is no longer the case and it does now work.

That allows the following changes to be made:
* Tests no longer need to use GlobalSoongConfigForTests() to
  prepopulate the cache.
* GlobalSoongConfigForTests() is only needed in the dexpreopt
  package.

Bug: 177892522
Test: m nothing
Change-Id: Ifcbb1a44254c5d2d10c1d02ab23227488d1d1ed1
 2021-01-21 15:44:30 +00:00
Paul Duffin
c059c8c9a0 Add java.RegisterRequiredBuildComponentsForTest function 
Insulate tests that exercise code in the java package from having to
register the build components provided by the java package by providing
a single function that registers them all. This follows the pattern
currently used in the cc and rust packages.

This change is in preparation for switching the dex_bootjars singleton
from a singleton, which does not require a module definition in order
to be instantiated, to a singleton module which does. That will require
adding a module definition into java.GatherRequiredDepsForTest() and
this change ensures that the required components will have been
registered in every test.

Bug: 177892522
Test: m nothing
Change-Id: I6475db8240894947dd07c89a940a3e4f201aa598
 2021-01-21 11:47:32 +00:00
Nicolas Geoffray
981c30ca1e Merge "dexpreopt: Use the dirty-image-objects path from frameworks/base." am: 324234bd00 am: d2aff3c2a1 am: e707c51e31 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555155

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica0522d7c8cad6c00fe444178d11fa3a5e1833c7
 2021-01-20 19:47:31 +00:00
Ulyana Trafimovich
1a2949251b Merge "Support building boot images with disabled dexpreopt." am: 0caabb6e27 am: 5602cf202b am: fb9314da42 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555134

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c35fc8382ab51307e4cb5e4a0b8b2d4c5553f8b
 2021-01-20 19:46:47 +00:00
Bill Peckham
dccab29858 Merge changes from topic "prebuilt-hiddenapi" am: 1c8e5e817e am: 24ac16d6e6 am: 96ddf7f0b3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1546365

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I626d7b1481b000c75a949522b91db36fc2fe213a
 2021-01-20 19:46:31 +00:00
Anton Hansson
e77fccc959 Add a better error message for missing api files 
Add some instructions for what to do.

Bug: 177806245
Test: m nothing (with java_sdk_library with no tracking files)
Change-Id: I286018f4d9105d5ade1e76cddb8670d0d097d77d
 2021-01-20 19:21:16 +00:00
Nicolas Geoffray
e707c51e31 Merge "dexpreopt: Use the dirty-image-objects path from frameworks/base." am: 324234bd00 am: d2aff3c2a1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555155

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e92e1ae8713f5451c9aa8aa097a576c3cd0f1a2
 2021-01-20 19:02:51 +00:00
Ulyana Trafimovich
fb9314da42 Merge "Support building boot images with disabled dexpreopt." am: 0caabb6e27 am: 5602cf202b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555134

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I21223b7babf61153570127b16157217316dfe52c
 2021-01-20 19:02:18 +00:00
Bill Peckham
96ddf7f0b3 Merge changes from topic "prebuilt-hiddenapi" am: 1c8e5e817e am: 24ac16d6e6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1546365

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e9ae289f82169794342723ba653a95a1f79241a
 2021-01-20 19:02:05 +00:00
Nicolas Geoffray
324234bd00 Merge "dexpreopt: Use the dirty-image-objects path from frameworks/base." 2021-01-20 18:13:20 +00:00
Ulyana Trafimovich
0caabb6e27 Merge "Support building boot images with disabled dexpreopt." 2021-01-20 17:46:02 +00:00
Bill Peckham
1c8e5e817e Merge changes from topic "prebuilt-hiddenapi" 
* changes:
  Supply LOCAL_SOONG_DEX_JAR for java_import with compile_dex.
  Enable an apex to include a java_import.
  Enable prebuilt hiddenapi CSV files.
 2021-01-20 17:43:48 +00:00
Nicolas Geoffray
1086e604b9 dexpreopt: Use the dirty-image-objects path from frameworks/base. 
Test: m
Bug: 176171716
Change-Id: Ifbc08ae03e2b1bec7161948970bd197386e3b305
 2021-01-20 14:31:32 +00:00
Ulya Trafimovich
a4a1c4ee98 Support building boot images with disabled dexpreopt. 
Bug: 176171716
Test: build_mainline_modules.sh and ensure that the ART boot image is
    built: `find out -type f -name '*.art'` is nonempty for every arch.
Change-Id: Ibc45581eef2b205c750a30709780cf659ba7cfa1
 2021-01-20 14:03:07 +00:00
JaeMan Park
518e0d3ac2 Merge "Make TestJavaSdkLibraryEnforce faster" am: cdbbb1ea68 am: 4198b5c05a am: 6f4465cd8d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1549896

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id839aafd0d44904eba24b66c5f9c784546f1fa96
 2021-01-20 02:15:36 +00:00
JaeMan Park
6f4465cd8d Merge "Make TestJavaSdkLibraryEnforce faster" am: cdbbb1ea68 am: 4198b5c05a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1549896

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba0c06839f0d0ecce8c660f03fb9dc44a36b180a
 2021-01-20 01:52:57 +00:00
JaeMan Park
cdbbb1ea68 Merge "Make TestJavaSdkLibraryEnforce faster" 2021-01-20 00:00:54 +00:00
Bill Peckham
fb04df4d57 Supply LOCAL_SOONG_DEX_JAR for java_import with compile_dex. 
Without LOCAL_SOONG_DEX_JAR, ninja fails with a missing
dependency error.

Test: m nothing
Test: new TestImportSoongDexJar
Bug: 173705556
Change-Id: I54a4c6ea93877667a3fb97f8b2621c42e431f577
 2021-01-19 18:15:16 +00:00
Bill Peckham
a41a6963b4 Enable an apex to include a java_import. 
With the addition of the compile_dex property to the
java_import module it becomes possible to include a
java_import module in an apex. This change allows the
dependency and adds a test.

Bug: 177228901
Test: m nothing
Test: new TestApexWithJavaImport
Change-Id: I9336dade1857109e2fd21f7d57e1dc4abc4a402c
 2021-01-19 18:15:03 +00:00
Bill Peckham
bae4749de2 Enable prebuilt hiddenapi CSV files. 
By enabling these hiddenapi CSV files to be prebuilt, it
becomes possible to create a split build that supports
the hiddenapi encode dex step, but doesn't contain all
of the java sources needed to generate the CSV files.

Bug: 175048716
Test: m nothing
Test: new TestHiddenAPISingletonWithPrebuiltCsvFile
Test: local build without prebuilt hiddenapi
Test: local build with prebuilt hiddenapi
Change-Id: I805ea3ec05860d2df211a3985ec025bf36f0d775
 2021-01-19 10:07:45 -08:00
Paul Duffin
d8733e056d Merge "Export dex implementation jars from prebuilt_apex" am: fe6147eb26 am: c022da2b2a am: bf4b8488e9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1523984

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ec430725444022e43e9532964fdf4134031158c
 2021-01-19 16:43:57 +00:00
Paul Duffin
bf4b8488e9 Merge "Export dex implementation jars from prebuilt_apex" am: fe6147eb26 am: c022da2b2a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1523984

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1a7c988c1afe2d53982d33ffc2b93853189169c
 2021-01-19 15:56:16 +00:00
Colin Cross
ff294f8d9c Merge "Revert "Add ArcSettings and SettingsGoogle to the legacy allowlist"" 2021-01-19 05:28:29 +00:00