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
Treehugger Robot
a37eb7e52b Merge changes from topic "remove_suffixes" am: a321926546 am: 38811402f3 am: 1a79e2e83a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2582911

Change-Id: Id2256bd1f94a0eb0e51a17d050acb41f21cab16a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 22:32:27 +00:00
Treehugger Robot
a321926546 Merge changes from topic "remove_suffixes" 
* changes:
  Propagate shared library destination path through FilesToZip
  Add -e argument to soong_zip to allow setting an explicit filename
  Support removing suffix for device specific prebuilt during build
 2023-05-10 20:30:11 +00:00
Romain Jobredeaux
8931fb1ba8 Merge "Map prebuilt_apis labels to Bazel's manually generated ones." am: ea48fdc6f8 am: bf315824ea am: 70a3c94895 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2582551

Change-Id: If3666ba362a5cf03535177dc21940d26bd92661e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 19:42:18 +00:00
Treehugger Robot
2833929496 Merge "Don't translate "required" to unsupported "data" in android_app." am: 26446238d6 am: 9e77afa6d0 am: df934857a3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2583158

Change-Id: I4eb108e68a0620e27f38ee5269b64a355328de78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 19:41:57 +00:00
Romain Jobredeaux
ea48fdc6f8 Merge "Map prebuilt_apis labels to Bazel's manually generated ones." 2023-05-10 18:23:51 +00:00
Treehugger Robot
26446238d6 Merge "Don't translate "required" to unsupported "data" in android_app." 2023-05-10 18:14:52 +00:00
Colin Cross
80462dc040 Propagate shared library destination path through FilesToZip 
Shared libraries in fuzz zip files may have a different filename than
their source file, for example when the source file is a prebuilt in
the source tree.  Propagate the computed library name through
FilesToZip to soong_zip to use the correct name in the zip file.

Bug: 254867347
Test: builds
Change-Id: Ib0def8decdbec7842b8e1a9056fac373d743bac0
 2023-05-09 23:19:31 +00:00
Alix Espino
e374dd6525 Merge "Delete java/rules.bzl file" am: 9241da9662 am: 3e10aabe32 am: 00f6ca1e7c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2578135

Change-Id: If45ffcf5fba13a42b9b6aea0c43be5d1c179adb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 22:21:54 +00:00
Romain Jobredeaux
56d41d0725 Don't translate "required" to unsupported "data" in android_app. 
Bug: 228514588
Test: Presubmits
Change-Id: Ib964073d24f03cc3cdd389ba28b44ed96b61d841
 2023-05-09 16:37:23 -04:00
Alix Espino
9241da9662 Merge "Delete java/rules.bzl file" 2023-05-09 20:18:36 +00:00
Jiakai Zhang
a44f099436 Merge changes from topic "revert-2580631-revert-2574032-XXTWCJDTDQ-YJWXHQZNPJ" am: 90c69f71c4 am: 7372e9d3f6 am: dc45b067aa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2582191

Change-Id: I419bfa20610eaba2fcbd0112983d82113d07cc2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 15:55:57 +00:00
Jiakai Zhang
90c69f71c4 Merge changes from topic "revert-2580631-revert-2574032-XXTWCJDTDQ-YJWXHQZNPJ" 
* changes:
  Revert^2 "Generate app profiles even if dexpreopt is disabled."
  Revert^2 "Generate boot image profiles even if dexpreopt is disabled."
 2023-05-09 13:50:55 +00:00
Jared Duke
812d0bd821 Merge "Fix Proguard configuration output from R8 invocation" am: fda5890f24 am: feadf8b0db am: 76d6f34ce3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2580792

Change-Id: Ia4cdfb51e083015eee5ec2bad0a02145d4b431f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 00:38:55 +00:00
Jared Duke
fda5890f24 Merge "Fix Proguard configuration output from R8 invocation" 2023-05-08 22:20:11 +00:00
Jiakai Zhang
cf61e3c591 Revert^2 "Generate app profiles even if dexpreopt is disabled." 
Revert submission 2580631-revert-2574032-XXTWCJDTDQ

Reason for revert: Fixed build breakages

Reverted changes: /q/submissionid:2580631-revert-2574032-XXTWCJDTDQ

Bug: 280440941
Test: lunch aosp_cf_riscv64_minidroid-userdebug && m UNSAFE_DISABLE_HIDDENAPI_FLAGS=true dist
Test: Disable dex2oat on host (to simulate macOS) and build
Change-Id: I6090b4b74cedb6d129fcbeef58d075c8ccdcc4e2
 2023-05-08 21:29:23 +01:00
Jiakai Zhang
bc698cd28a Revert^2 "Generate boot image profiles even if dexpreopt is disabled." 
Revert submission 2580631-revert-2574032-XXTWCJDTDQ

Reason for revert: Fixed build breakages

Reverted changes: /q/submissionid:2580631-revert-2574032-XXTWCJDTDQ

Bug: 280440941
Test: lunch aosp_cf_riscv64_minidroid-userdebug && m UNSAFE_DISABLE_HIDDENAPI_FLAGS=true dist
Test: Disable dex2oat on host (to simulate macOS) and build
Change-Id: I5f7f746ca1d4da660fe0c40115e6c71750dfdccc
 2023-05-08 21:28:13 +01:00
Romain Jobredeaux
8242b43df8 Map prebuilt_apis labels to Bazel's manually generated ones. 
Change-Id: I5bec807da9b39e2b166af1bd83da43df91f997ef
Bug: 237810289
Test: check that android-non-updatable.stubs.module_lib uses manual
bazel target for its sdk_system_current_android dependency

Change-Id: I6f5fb348e1dcaad10eb756382359f34de792b6e0
 2023-05-08 15:26:43 -04:00
Jared Duke
34c6d7d56f Fix Proguard configuration output from R8 invocation 
The output when using `--pg-conf-output` seems to be flaky. In the
meantime, use `-printconfiguration` to generate full config summaries
for each R8 invocation.

Bug: 281081834
Test: m && \
      find $ANDROID_BUILD_TOP/out -name proguard_configuration -empty
Change-Id: I0c8c36212e338b50505184076f4c470a5d3d9b94
 2023-05-05 21:05:33 +00:00
Qiao Yang
bfbdde8f05 Merge changes from topic "revert-2574032-XXTWCJDTDQ" am: 7081aaf874 am: f5b8864109 am: e7d86110d4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2580631

Change-Id: Ibb066f7ec668deae624dcde79e4b0461aea0e2ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 18:50:03 +00:00
Qiao Yang
7081aaf874 Merge changes from topic "revert-2574032-XXTWCJDTDQ" 
* changes:
  Revert "Generate boot image profiles even if dexpreopt is disabled."
  Revert "Generate app profiles even if dexpreopt is disabled."
 2023-05-05 16:43:45 +00:00
Qiao Yang
8d8c660710 Revert "Generate boot image profiles even if dexpreopt is disabled." 
Revert submission 2574032

Reason for revert: DroidMonitor-triggered revert due to breakage <https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_riscv64_minidroid-userdebug&lkgb=10069333&lkbb=10075041&fkbb=10071083>, bug <b/280902279>

Reverted changes: /q/submissionid:2574032

Change-Id: I8e99f8231639198b149ea8d822ee7f9a5b391a89
BUG: <280902279>
 2023-05-05 15:03:24 +00:00
Qiao Yang
3d08c388b9 Revert "Generate app profiles even if dexpreopt is disabled." 
Revert submission 2574032

Reason for revert: DroidMonitor-triggered revert due to breakage <https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_riscv64_minidroid-userdebug&lkgb=10069333&lkbb=10075041&fkbb=10071083>, bug <b/280902279>

Reverted changes: /q/submissionid:2574032

Change-Id: Ia9d05f3b7439604eb4a4b4100f46879fe11f5820
BUG: <280902279>
 2023-05-05 15:03:24 +00:00
Treehugger Robot
6bfbc85161 Merge "Provide a resource_prefix_strip for java_resources in bp2build." am: c144c08d2a am: e30e950cca am: b25bd9c8b3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2577053

Change-Id: I6114f97deef8dcc2da33a8f29425d3fa2b0e8b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 03:14:56 +00:00
Treehugger Robot
b416545fa8 Merge "Enable prebuilt apk checks" am: ee6bd5a7b2 am: deff89e366 am: 2c7fc3f729 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2580150

Change-Id: I863d00d6a0aad8e5e938ffa2b4bb1ff51d4e2a80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 03:14:45 +00:00
Treehugger Robot
0a71423fa8 Merge "Add genrule to build *.latest.version build target." am: da8ebf235c am: 8731c2d789 am: 754cd926cb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2550834

Change-Id: Ie41c1c55cd525e2fc6d9334c878a857ef2a42119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 03:13:46 +00:00
Treehugger Robot
c144c08d2a Merge "Provide a resource_prefix_strip for java_resources in bp2build." 2023-05-05 01:44:03 +00:00
Treehugger Robot
ee6bd5a7b2 Merge "Enable prebuilt apk checks" 2023-05-05 01:30:35 +00:00
Treehugger Robot
da8ebf235c Merge "Add genrule to build *.latest.version build target." 2023-05-05 01:00:32 +00:00
Jiakai Zhang
585b3d55b2 Merge changes I4e721b47,I1bf05ade am: dbfcf85c53 am: 908776467d am: 5ee0b6950f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2574032

Change-Id: Ib901e4213a44911de41b9af5c008f7ebc213a0eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 00:21:24 +00:00
Jiakai Zhang
dbfcf85c53 Merge changes I4e721b47,I1bf05ade 
* changes:
  Generate app profiles even if dexpreopt is disabled.
  Generate boot image profiles even if dexpreopt is disabled.
 2023-05-04 22:13:08 +00:00
Gurpreet Singh
daa314ac97 Add genrule to build *.latest.version build target. 
Build a new target *.latest.version which will contain a text file
containing the last finalized version.

Bug: 242316893
Test: atest prebuilt_apis_test
Change-Id: I41fa91c9ec273f342b7807c66c4d65ba13260124
 2023-05-04 21:02:47 +00:00
Cole Faust
ccb20f47d5 Enable prebuilt apk checks 
Now that existing violations set the skip flag.

Bug: 185811447
Test: Presubmits
Change-Id: Ia513b71be1cd878f36fdb28c94ef3cdc3f2a6bc6
 2023-05-04 12:38:24 -07:00
Romain Jobredeaux
d5fe133077 Provide a resource_prefix_strip for java_resources in bp2build. 
Although paths to resource files in a Bazel java_library should be
relative to the package, the directory structure in the resulting jar
will have resources under the full path from the top-level of the
workspace, e.g. if a library in "a/BUILD" has java_resouces as
"res/res.txt" then by default the res.txt file would appear under
"a/res/res.txt".
Fix this by adding a resource_strip_prefix in that case.

Test: Unit tests
Change-Id: If4325126f5c19a2a8fb83ee09bc3a95a18673fe3
 2023-05-04 14:54:45 -04:00
Alix
83a8bc47d2 Delete java/rules.bzl file 
Bug: 277800767
Test: treehugger
Change-Id: Idc80cd51317d167fca8d5543bb53c585adeaddad
 2023-05-04 18:03:23 +00:00
Sam Delmerico
cf7c4736dd Merge changes from topic "privapp_allowlist_prop" am: 717840fdfc am: cbc478d1d5 am: 8478c113bf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2188697

Change-Id: I71ce87a11b318f7ae3a9817788d973849feba840
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 16:09:15 +00:00
Sam Delmerico
717840fdfc Merge changes from topic "privapp_allowlist_prop" 
* changes:
  add privapp_allowlist property to android_app
  Add script for modifying privapp permission allowlists
 2023-05-04 13:57:17 +00:00
Jiakai Zhang
7b845e808f Generate app profiles even if dexpreopt is disabled. 
Bug: 280440941
Test: -
  1. Patch ag/22302622 to disable dexpreopt.
  2. lunch aosp_cf_x86_64_phone-userdebug && m
  3. See app profiles still generated.
Test: -
  1. Patch ag/20592051 to enable profile for service-art.
  2. banchan com.android.art x86_64 && m
  3. See the profile for service-art generated.
Change-Id: I4e721b475b84a2f667bbccc030a8947078f26bb0
 2023-05-04 13:53:22 +01:00
Andrei Onea
580636bdd2 add privapp_allowlist property to android_app 
This change allows override_android_app to use the same
privapp_allowlist as the non-override module so that they will always
remain in sync.

Test: go test ./java -v -run TestPrivappAllowlist
Test: go test ./apex -v -run TestApexWithApps
Test: m com.android.permission com.google.android.permission and verify
  manually that apex_payload.img contains correct privapp_allowlist
Test: m com.android.permission before and after change &&
  `diffoscope apex_payload_reference.img apex_payload_with_change.img`
  && verify that there are no semantic changes
Bug: 242509786
Change-Id: Ifdcb28af40763aed7a4aac9a7f681153554bc256
 2023-05-03 15:03:34 +00:00
Jiakai Zhang
b95f8345c8 Generate boot image profiles even if dexpreopt is disabled. 
Bug: 280440941
Test: -
  1. Patch ag/22302622 to disable dexpreopt.
  2. See boot image profiles still generated.
Change-Id: I1bf05ade53fa83f3dba46f28a8f9246ba1fdf664
 2023-05-03 15:25:18 +01:00
Cole Faust
9e4c6c9cc7 Merge "Use api_levels_released_versions from starlark" 2023-05-02 21:55:15 +00:00
Jeongik Cha
74973086d1 Merge "Get rid of DeviceName() from path related to dexpreopt" am: 30208863b4 am: 3a4b8a3d56 am: 2d3d46d306 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2546714

Change-Id: I37876024388d199204c527112ef39ae163a2ae8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 10:24:53 +00:00
Jeongik Cha
30208863b4 Merge "Get rid of DeviceName() from path related to dexpreopt" 2023-05-02 05:07:03 +00:00
Cole Faust
3486740cc5 Use api_levels_released_versions from starlark 
Instead of exporting it to soong_injection.

Bug: 279095899
Test: m nothing
Change-Id: I7b93af233b7450848a475512b5f5682ece773c09
Merged-In: I7b93af233b7450848a475512b5f5682ece773c09
 2023-05-02 01:05:07 +00:00
Cole Faust
bda0ca753e Use api_levels_released_versions from starlark 
Instead of exporting it to soong_injection.

Ignore-AOSP-First: Needed to resolve merge conflict
Bug: 279095899
Test: m nothing
Change-Id: I7b93af233b7450848a475512b5f5682ece773c09
 2023-05-01 12:45:47 -07:00
Spandan Das
a76484e0bd Merge changes from topic "bp2build-ignore-test-apex-tags" am: 934d5047ef am: 03079bd97a am: 6573de464f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2569070

Change-Id: I91c6ff5a8023a9a789cd626835bd594581eeb984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 18:04:40 +00:00
Spandan Das
934d5047ef Merge changes from topic "bp2build-ignore-test-apex-tags" 
* changes:
  Ignore test apexes from bp2build generated tags
  Ignore test apexes from bp2build generated tags
 2023-05-01 16:05:38 +00:00
Treehugger Robot
c4bf5f1a3a Merge "target_sdk_version replacement should respect REL branches" am: e605b39e61 am: 3b1fbf0846 am: b2404259d7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2568331

Change-Id: I256da559b28b1d64375e575a7ad8709cfec6ee2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 01:11:05 +00:00
Treehugger Robot
e605b39e61 Merge "target_sdk_version replacement should respect REL branches" 2023-04-28 23:18:16 +00:00
Cole Faust
600315bcd4 Merge "Expand preprocessed flag to work on android_app_imports" am: 03cf3181d3 am: 13a56750d1 am: 9519b42a9c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2542010

Change-Id: I4ce721b923a61e0bc7cf7480c765cac206efa632
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 21:49:59 +00:00
Spandan Das
fb6a1ee68b target_sdk_version replacement should respect REL branches 
Currently, target_sdk_version of MTS tests were being set to 10000 even
in release branches. This should only happen in active branches.

Test: Unit test
Test: aapt2 on CtsContentTestCases in udc-dev and verified
targetSdkVersion is 34
Bug: 279507428

Change-Id: Ib79318febc0f6e771b3679c0281a97357930ec56
 2023-04-28 16:23:53 +00:00