StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
68,588 Commits 1 Branch 0 Tags
a37eb7e52be12b31de0af42d5792fb99f3f6ab84
Commit Graph

6818 Commits

Author SHA1 Message Date
Jeongik Cha
4753b39cca Get rid of DeviceName() from path related to dexpreopt 
As-is, dexpreopt config and bootjar is in the dir including
DeviceName(). It causes unnecessary dexpreopt invocation when target is
changed repeatly. To avoid it, rename dir to common name.

Bug: 278833696
Test: m
Change-Id: I2818d9ae09e6c22ca6989cc8efdb70b470ec502c
 2023-04-28 11:50:18 +09:00
Spandan Das
39b6cc5336 Ignore test apexes from bp2build generated tags 
Soong does not enforce apex_available on the contents of test apex. To
prevent special-casing test apexes in the apex validation aspect in
Bazel, drop the test apexes from the tags altogether.

( The core problem I am trying to solve is making sure that stub
libraries in Bazel have a single apex available. apex validation happens
to be a nice side benefit)

Bug: 277651159
Test: go test ./bp2build
Change-Id: Ibb3cfedb5c0f2cda0464bf3758c70b67cb5885d1
 2023-04-27 23:24:49 +00:00
Cole Faust
03cf3181d3 Merge "Expand preprocessed flag to work on android_app_imports" 2023-04-27 17:18:59 +00:00
Cole Faust
2f1da168ab Expand preprocessed flag to work on android_app_imports 
Setting the preprocessed flag will now also verify that the apk is
zip-aligned and does not have compressed JNI libs or dex files.

Bug: 185811447
Test: m nothing
Change-Id: I01b7c25f390345b14385f6f9e1640f48a5d9dc93
 2023-04-25 15:04:58 -07:00
Jihoon Kang
5e720cbf1d Merge "Utilize from text core platform api surface jar in build" am: b420705230 am: 38c5c6e445 am: 487cdc786a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2514755

Change-Id: I2a2b1712df0430aa239d0c25b34be3d8704138bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 20:52:18 +00:00
Jihoon Kang
b420705230 Merge "Utilize from text core platform api surface jar in build" 2023-04-25 17:48:25 +00:00
Alex Buynytskyy
e9184d757e UpsideDownCake/34 is now REL 
Ignore-AOSP-First: UpsideDownCake Finalization
Bug: 275409981
Test: build
Change-Id: Iaa3054f3449a5bf6887c24937646d22c79c4af1e
Merged-In: Iaa3054f3449a5bf6887c24937646d22c79c4af1e
 2023-04-21 19:36:27 +00:00
Jihoon Kang
26b0dff329 Merge "Add additional java_api_library module to java testing" am: d1a038c183 am: 8ce85df02b am: 115dae4d1c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2541410

Change-Id: Ib53077770b1d8ea6014b4128f1d52986590da2f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 04:43:54 +00:00
Jihoon Kang
fb502593cd Add additional java_api_library module to java testing 
Module lib surface is comprised of contributions from art, conscrypt,
and i18n api domains. On top of this, the module lib api surface generates an additional stub library containing the contributions of the non-updatable api domains. Adding this additional module to the testing module enables more thorough testing of module lib api scope java_api_library modules.

Test: m
Change-Id: Ia648651fb9e6cba2642de7e8d39047d888bf49ce
 2023-04-17 21:28:47 +00:00
Cole Faust
3cec6f3609 Merge "Remove special handling of prebuilt_framework-res" am: 35dcf77fb6 am: 76093aad8d am: 4d76485722 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2536611

Change-Id: I194b57c9dd723a058f14f354b539da9407dc2128
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 20:08:50 +00:00
Cole Faust
d580613a0e Remove special handling of prebuilt_framework-res 
prebuilt_framework-res doesn't appear to exist anymore.

Bug: 185811447
Test: m nothing
Change-Id: Ib1aa929fbe007f87d03bdc85e4d54c6fae4e510b
 2023-04-13 15:48:30 -07:00
Romain Jobredeaux
f958f61007 Merge "Bp2build support for sdk_version and java_version." am: a3c029e7d5 am: f8ebe7f3e8 am: e9ab0a3cef 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2454209

Change-Id: I37aac3f2bc75d86d40dc673cb0a43c475abd41cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 22:32:40 +00:00
Romain Jobredeaux
a3c029e7d5 Merge "Bp2build support for sdk_version and java_version." 2023-04-13 20:53:07 +00:00
Romain Jobredeaux
2eef2e13e9 Bp2build support for sdk_version and java_version. 
This CL adds java_version and sdk_version support to bp2build
converters for
   - java library
   - java binary
   - android library
   - android binary
   - android library import

Although java import doesn't support java_version and sdk_version, the
neverlink java_library wrapper around a java_import must specify a
sdk_version when targetting a device. "none" is used by convention.

Change-Id: I22a69dea2e351858368df69ed6a703b568d613ea
Bug: 215230098
Test: Presubmits
 2023-04-11 21:05:48 -04:00
Alex Buynytskyy
d1c6e334a0 UpsideDownCake is now 34 
Ignore-AOSP-First: UpsideDownCake Finalization
Bug: 275409981
Test: build
Change-Id: I70da9e094781c49ce3fa905e202fa0114696aa77
 2023-04-06 22:17:26 +00:00
Jihoon Kang
b507831b71 Utilize from text core platform api surface jar in build 
Use JavaApiLibraryName function to redirect the usage
of core platform api stubs from .txt files based on config.

Test: m --build-from-text-stub
Change-Id: I926a0a455fed301ba4ff9dfa509d4dbbbd076029
 2023-04-06 18:34:32 +00:00
Jihoon Kang
5d1c489f52 Merge "Update java_api_library in testing modules" am: 3bfba4c723 am: 7cec47c124 am: 81e8a21ee4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2523975

Change-Id: I936b1c9851140426a9cf8e2d4f3a91068c774246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 01:06:50 +00:00
Jihoon Kang
3bfba4c723 Merge "Update java_api_library in testing modules" 2023-04-05 23:27:50 +00:00
Romain Jobredeaux
4aced13de2 Merge "Bp2build converter for java_host_for_device." am: 15807fa7ed am: e1a37d8189 am: c886dff902 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2522155

Change-Id: Iefbd54374bb9a8150a39f3385c1fd5bb80945e34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 15:18:27 +00:00
Romain Jobredeaux
f2bcb862f3 Merge "Support arch variants in java's StaticLibs in bp2build" am: b2539d08ed am: 090223b966 am: d2c9df6b93 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2521437

Change-Id: If15fb36748be5ee25aa5783dc1c04437e8edc910
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 15:18:17 +00:00
Romain Jobredeaux
15807fa7ed Merge "Bp2build converter for java_host_for_device." 2023-04-05 13:32:29 +00:00
Romain Jobredeaux
b2539d08ed Merge "Support arch variants in java's StaticLibs in bp2build" 2023-04-05 13:32:29 +00:00
Romain Jobredeaux
eb711b9f7c Support arch variants in java's StaticLibs in bp2build 
Test: Presubmits
Bug: 276901800
Change-Id: I6058a726833ef10a5f470946e2d265b20fa547ce
 2023-04-04 19:50:13 -04:00
Romain Jobredeaux
e7370eabe4 Bp2build converter for java_host_for_device. 
Change-Id: I70a345c641bbed3223dc6222062fb6948f7dc6cb
Bug: 276710283
Test: Presubmit
 2023-04-04 19:49:17 -04:00
Jihoon Kang
c0a24205a7 Update java_api_library in testing modules 
The full api surface java_api_library modules are currently defined as
java_library modules instead of java_api_library modules. This change
corrects this and modifies the DepsInfo of java_api_library so that it
can be compatible in tests.

Test: go ./java
Change-Id: I540b5a930f506ce5f7663ab6e07c6df49af15cf9
 2023-04-04 22:52:37 +00:00
Treehugger Robot
ef8646f41f Merge changes I0ab8459b,I2ef90f4d am: 28ba80665d am: 170e0c87a5 am: 15373a714b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2521436

Change-Id: I401446ca9dc4a04da1092c1e4b76901ba491824f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 19:41:03 +00:00
Treehugger Robot
28ba80665d Merge changes I0ab8459b,I2ef90f4d 
* changes:
  Create core-lambda-stubs from .txt files
  Fix the suffix used in names of java_system_modules
 2023-04-04 17:54:56 +00:00
Victor Chang
df60d440f6 Merge "Add com.android.tools.r8.emitRecordAnnotationsExInDex flag" am: 32952b975d am: 7e1f02b9b9 am: 6f43448019 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2495879

Change-Id: Ie88dc2712045c9ae57f9db440c3c3ea4da9b73b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 12:12:20 +00:00
Victor Chang
32952b975d Merge "Add com.android.tools.r8.emitRecordAnnotationsExInDex flag" 2023-04-04 11:12:05 +00:00
Jihoon Kang
a9e89fa323 Merge "Add dep_api_srcs property to java_api_library module" am: 91a86d4112 am: 6f8a62b72a am: 22bd36e459 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2485976

Change-Id: I18de957424949775bfa3a6fec6534d37bb0d4f86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 00:58:19 +00:00
Spandan Das
760f880495 Create core-lambda-stubs from .txt files 
APIs to compile lambda are part of art's toolchain api surface.
Generating stubs from .txt files allows us to prune the remaining sdk
dependencies on libcore/ that are not api files

Test: m core-lambda-stubs.from-text
(On top of change containing core.current.stubs.from-text
and turning enabled: true)

Change-Id: I0ab8459b9317cb055a434eb635ba06d38da5b92e
 2023-04-03 23:42:08 +00:00
Spandan Das
0cb803a5d6 Fix the suffix used in names of java_system_modules 
Test: N/A (enabled flag is still off)
Change-Id: I2ef90f4d9099bf183d65dcf8ebdf532d5fa445b6
 2023-04-03 23:29:57 +00:00
Treehugger Robot
ee0ae49674 Merge changes Ib9ff4eb5,If27a050c am: 71585a0187 am: 2448d10b58 am: 7190c6776a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516456

Change-Id: Icfe3bdd0065b2c60233ea6a3b184a9b274d4896f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 20:58:41 +00:00
Spandan Das
01d5dd882c Merge "Rename core stubs to .txt stubs if applicable" am: 77e3278c50 am: ac7b7d2a89 am: 83f7ac9d8d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2514796

Change-Id: I13629ee9000f208c25ad53fe478bdd61b6be0823
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 20:57:43 +00:00
Jihoon Kang
01e522cac5 Add dep_api_srcs property to java_api_library module 
Users can pass the jar-file creating module via dep_api_srcs property in
java_api_library to create the jar file not by compiling the stubs
generated from metalava but by extracting and zipping the class files
from the jar file of the input module.

Test: m android-non-updatable.stubs.from-text
Bug: 273381329
Change-Id: Id1b75179111cc7ff45faaff58388db1347bb18e5
 2023-04-03 17:53:40 +00:00
Treehugger Robot
71585a0187 Merge changes Ib9ff4eb5,If27a050c 
* changes:
  add *.from-text modules to the java test fixture
  Create a SetBuildFromTextStub method
 2023-04-03 16:44:08 +00:00
Spandan Das
77e3278c50 Merge "Rename core stubs to .txt stubs if applicable" 2023-04-03 16:37:53 +00:00
Treehugger Robot
99fc0f1a2b Merge "Remove stub-annotations from art stubs system modules" am: 1c102d34b7 am: 5485148807 am: da56dee349 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2515531

Change-Id: I59aebc304bf7571fdc896f86bc85a0fdbcf26791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 12:23:00 +00:00
Treehugger Robot
1c102d34b7 Merge "Remove stub-annotations from art stubs system modules" 2023-04-03 10:49:15 +00:00
Treehugger Robot
196382c13e Merge changes Ie9d465f5,Idd89d656,I0a13a0e7 am: cdbb1a999f am: 09a2632958 am: 5a512834bf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2513924

Change-Id: Ibecb97ca51c3417413d2eaced72ff41b17f0b5f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 20:36:43 +00:00
Treehugger Robot
f5b59e98d4 Merge "rename aidl/library.bzl to aidl/aidl_library.bzl" am: 840d49a564 am: 0110b797e8 am: 2caef94970 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2515436

Change-Id: Ibe1ef9d638b20f38753b767d24674bc97b6c337d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 20:10:39 +00:00
Treehugger Robot
cdbb1a999f Merge changes Ie9d465f5,Idd89d656,I0a13a0e7 
* changes:
  Create core_platform system modules from .txt files
  Create system modules using .txt stubs
  Create a defaults module for stripping out annotations
 2023-03-31 19:37:01 +00:00
Spandan Das
a335e1de36 Remove stub-annotations from art stubs system modules 
This system module is used to compile conscrypt and icu stubs. These
have migrated to java_sdk_library that set `annotations_enabled: true`
explicitly.

Test: m
Test: TH
Change-Id: I65ceb1fbf0dcdbb3504b69ebce6ca8f0b67e964d
 2023-03-31 19:28:55 +00:00
Treehugger Robot
840d49a564 Merge "rename aidl/library.bzl to aidl/aidl_library.bzl" 2023-03-31 18:26:33 +00:00
Treehugger Robot
bed1d1cb11 Merge changes I1ed3ab24,I68678ddf am: 2d704998f4 am: 9b9cda6b14 am: b05664f90c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2513937

Change-Id: Ibc9e5b8bea86717c670ff8d22bb8bf9a814a9c23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 17:08:05 +00:00
Sam Delmerico
e55bf08de2 rename aidl/library.bzl to aidl/aidl_library.bzl 
Test: b test --config=android //build/bazel/...
Change-Id: I7e22ee5ffa391ddaf43a3eec17812be78f2d86ab
 2023-03-31 09:48:27 -04:00
Victor Chang
397e7e2e89 Add com.android.tools.r8.emitRecordAnnotationsExInDex flag 
It enables annotations for record components.

Bug: 272698028
Test: m droid
Change-Id: I9b45526c2dcdb2de458d874a0c222108a69eee71
 2023-03-31 11:01:41 +01:00
Spandan Das
6bd19dd4c5 add *.from-text modules to the java test fixture 
Test: go build ./java

Change-Id: Ib9ff4eb59ff63dc208b7a28626d42b53153c86d6
 2023-03-30 21:37:54 +00:00
Treehugger Robot
ffddc94522 Merge "Modify Soong to utilize from-text android.jar in build" am: bc2906efef am: e518bf7c3d am: 5746993043 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2411272

Change-Id: Ibb008c511597b5746bc9c70c9368c4a3fe3322da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:43:57 +00:00
Spandan Das
e339a2d9a3 Rename core stubs to .txt stubs if applicable 
In scope:
- core.current.stubs
- system modules generated for core's public stubs
- system modules generated for core's module_lib stubs

The system modules generated for core_platform api surface will be
handled in aosp/2514755

Test: go build ./java
Change-Id: I34134f79c8ae6e5b218d0b85553de5a748a8cc3f
 2023-03-30 02:59:22 +00:00