StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,212 Commits 1 Branch 0 Tags
33a0dc9153da5c844d2518f5e142f344fb2d80d0
Commit Graph

37453 Commits

Author SHA1 Message Date
Treehugger Robot
33a0dc9153 Merge "Move clean-oat-host to build/core/tasks/art.mk" into main am: 98905f38c2 
Original change: https://android-review.googlesource.com/c/platform/build/+/3127593

Change-Id: I185383a0ab40c123536adc5e382954d27d2c76e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-14 00:50:13 +00:00
Treehugger Robot
98905f38c2 Merge "Move clean-oat-host to build/core/tasks/art.mk" into main 2024-06-14 00:46:46 +00:00
Treehugger Robot
3694e76222 Merge "Require protobuf for build flags" into aosp-main-future 2024-06-13 20:05:39 +00:00
Treehugger Robot
f3aab9de59 Merge "Allow experimental use of Java 21 by default in makefiles" into main am: 0aeb964be8 
Original change: https://android-review.googlesource.com/c/platform/build/+/3125236

Change-Id: I3591e94a4a92ec6a3f5b822ce44de20993d1614f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-13 19:19:32 +00:00
Treehugger Robot
0aeb964be8 Merge "Allow experimental use of Java 21 by default in makefiles" into main 2024-06-13 19:15:50 +00:00
LaMont Jones
e3e84fc1b7 Require protobuf for build flags 
This change forces build flags from .scl to .textproto format.

Bug: 328495189
Bug: 338450506
Test: manual, TH
Merged-In: Ia33aae158d62c12666d97449cea0c02b60550a21
Change-Id: Ia33aae158d62c12666d97449cea0c02b60550a21
 2024-06-13 10:54:21 -07:00
Treehugger Robot
03468748d3 Merge "Shift the preprocess mk before build emulator packages" into main am: 9566130852 
Original change: https://android-review.googlesource.com/c/platform/build/+/3128074

Change-Id: Ia51da8f3a3da18ce26af01d6503c2c2dc6491792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-13 08:36:39 +00:00
Herbert Xue
9852b95ff3 Shift the preprocess mk before build emulator packages 
Test run:
- https://android-build.corp.google.com/builds/abtd/run/L68900030004495469

Bug: 344588337
Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk_g3caiman_x86_64 TARGET_RELEASE=trunk TARGET_BUILD_VARIANT=userdebug droid dist
Change-Id: I7d050428d5cc17de8078f8824991b71b7915a4a4
 2024-06-13 14:36:13 +08:00
Treehugger Robot
c17b8e9aa6 Merge "Move license metadata declaration of bramble/Android.mk into meta-lic.mk" into main am: f94c02c7f3 
Original change: https://android-review.googlesource.com/c/platform/build/+/3127554

Change-Id: I3eb52390b1da643d2e28e373560bde96d35076e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-13 02:43:51 +00:00
Treehugger Robot
f94c02c7f3 Merge "Move license metadata declaration of bramble/Android.mk into meta-lic.mk" into main 2024-06-13 02:34:51 +00:00
Nelson Li
4abfb5c09e Move clean-oat-host to build/core/tasks/art.mk 
Since Soong genrules now run in sandboxed mode, they cannot execute
commands like `rm -rf` within `clean-oat-target` to remove physical
directories.

The only solution is to move the `clean-oat-target` commands into
`build/core/tasks`.

Bug: 345133095
Test: m clean-oat; m clean-oat-host
Change-Id: Ifce4d5dc4bdb8e3735784135cf6f2ff143e90fe9
 2024-06-13 02:09:35 +00:00
Treehugger Robot
200880c0b7 Merge "Convert appcompat.sh to a Python binary" into main am: 3dcc84df5c 
Original change: https://android-review.googlesource.com/c/platform/build/+/3106579

Change-Id: I5bdfde8f27751ae817596c1a1dbcb1411c31f3c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-13 01:06:05 +00:00
Treehugger Robot
3dcc84df5c Merge "Convert appcompat.sh to a Python binary" into main 2024-06-13 00:51:27 +00:00
Herbert Xue
5c71b1af0e Move license metadata declaration of bramble/Android.mk into meta-lic.mk 
Bug: 346457924
Test: NA
Change-Id: Ie0fcb71bd3a10d54700256f3e19296a6aaac1298
 2024-06-12 14:34:31 +08:00
Sorin Basca
73ba79702e Allow experimental use of Java 21 by default in makefiles 
Bug: 342332820
Test: EXPERIMENTAL_TARGET_JAVA_VERSION_21=true m javac-check lint-check dist
Change-Id: I510746d617c49a0423f1ab0171a3474b181c3875
 2024-06-11 14:30:39 +01:00
Treehugger Robot
fc9567c25b Merge "Add license metadata declaration in device/generic/goldfish" into main am: a96b36bd9f 
Original change: https://android-review.googlesource.com/c/platform/build/+/3113262

Change-Id: I27d42d389336a7fd2edb7f3b08a7f75a3c971f8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-08 02:24:47 +00:00
Treehugger Robot
a96b36bd9f Merge "Add license metadata declaration in device/generic/goldfish" into main 2024-06-08 02:07:02 +00:00
Treehugger Robot
812d3e988c Merge "Add support to disable adb root on userdebug builds based on product config" into main am: 878141b810 
Original change: https://android-review.googlesource.com/c/platform/build/+/3118597

Change-Id: Idc6a114fa58a832dac67000489c97d00ae1a4975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-08 00:46:16 +00:00
Treehugger Robot
878141b810 Merge "Add support to disable adb root on userdebug builds based on product config" into main 2024-06-08 00:26:20 +00:00
Treehugger Robot
e48e393a12 Merge "Fix expansion of _include_stack in _import-node" into main am: 7120481a00 
Original change: https://android-review.googlesource.com/c/platform/build/+/3119358

Change-Id: I8d0014c551d42be8cf3e81cd23e6b1378314dd12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 23:42:17 +00:00
Joe Onorato
d4b4224e02 Add support to disable adb root on userdebug builds based on product config 
Test: manually verify
Bug: 345480978
Change-Id: I00cf7d30f66137055ed0aa495bf3d98143c391b7
 2024-06-07 16:24:06 -07:00
Spandan Das
cc4e318dce Merge "Prevent implicit outputs created during dexpreopt_config.zip" into main am: d7c448f0f7 
Original change: https://android-review.googlesource.com/c/platform/build/+/3117879

Change-Id: I5043fae20d7b533fe8fa4d1de1aa345c27c2a63f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 21:51:03 +00:00
Rashid Zaman
7a29da75fe Fix expansion of _include_stack in _import-node 
During product configuration after a subgraph has been fully imported,
i.e. a makefile and all makefiles it inherits from have been imported,
the makefile representing the root node of this subgraph is meant to be
removed from _include_stack in the _import-node macro via the call to
the wordlist function. Instead, _include_stack is being cleared because
the last argument to the wordlist function is escaped so when it is
expanded before being passed to wordlist instead of expanding to the
value of _include_stack the reference to _include_stack is unescaped.
Fix this by removing the escaping of the variable reference.

This issue has no impact on product configuration but the correct value
of _include_stack helps when debugging product configuration because,
for example, the dumpconfig generated by 'product-config' contains the
value of _include_stack when nodes are imported.

Bug: 345709996
Test: lunch aosp_cf_x86_64_phone-trunk_staging-userdebug && \
  m nothing shows no change to build.ninja files
Test: Run product-config and dumpconfig.csv shows correct include
  stack, e.g. for telephony_product.mk

Change-Id: I5a9b22fffc147ceea3d49e298b1bbad45f71332c
Signed-off-by: Rashid Zaman <rashidz@meta.com>
 2024-06-07 14:46:16 -07:00
Spandan Das
d7c448f0f7 Merge "Prevent implicit outputs created during dexpreopt_config.zip" into main 2024-06-07 21:28:44 +00:00
Spandan Das
d9d72c46ba Prevent implicit outputs created during dexpreopt_config.zip 
$PRODUCT_OUT/dexpreopt_config.zip is created by zipping all the
dexpreopt configs of individual apps. These config files are created in
$PRODUCT_OUT/dexpreopt_config, and this dir is as used as -C for
soong_zip.

In the current implementation, this build action also implicitly copies
global configuration files dexpreopt.config and dexpreopt_soong.config
into $PRODUCT_OUT/dexpreopt_config with the intent of being included in
the resultant zip file. These implicit outputs are unknown to ninja.

This CL prevents creation of these implicit outputs.
out/soong/dexpreopt_soong.config and
out/soong/dexpreopt_<arch>/dexpreopt.config is now passed directly to
soong_zip via -f.

Bug: 333316620
Test: m out/target/product/vsoc_x86_64/dexpreopt_config.zip # no longer
bit identical since the relative order changes, dexpreopt(_soong).config
now appears at the bottom of the zip
Test: zipcmp dexpreopt_config.zip.before dexpreopt_config.zip.after # no
diffs

Change-Id: Ib30c9a5c436e263231f9688129ab94664277b841
 2024-06-07 17:45:19 +00:00
Treehugger Robot
4401accfe0 Merge "Build build_flags.json in soong" into main am: 04837c61f3 
Original change: https://android-review.googlesource.com/c/platform/build/+/3011233

Change-Id: Ia33e4242d757bf6be4158039d5f88147ec7d99b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 05:31:15 +00:00
Treehugger Robot
04837c61f3 Merge "Build build_flags.json in soong" into main 2024-06-07 05:12:31 +00:00
Treehugger Robot
4203b5baa7 Merge "Drop product config include tags" into main am: 27d977e49b 
Original change: https://android-review.googlesource.com/c/platform/build/+/3098637

Change-Id: I2eabcd961c55645bfe4e74cf5d4f4ccf6638290e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 22:16:18 +00:00
Treehugger Robot
27d977e49b Merge "Drop product config include tags" into main 2024-06-06 22:12:38 +00:00
Vilas Bhat
c39e47f792 Merge "Propagate libpower no lock during binder transaction flag to soong" into main am: eae45e70ca 
Original change: https://android-review.googlesource.com/c/platform/build/+/3107745

Change-Id: Id7c5484f3b09a6747c3d5da5338109931d968f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 04:13:37 +00:00
Vilas Bhat
eae45e70ca Merge "Propagate libpower no lock during binder transaction flag to soong" into main 2024-06-06 03:55:52 +00:00
Treehugger Robot
b8e6e297e3 Merge "Include sdk-preprocess-files.mk before process sdk.atree" into main am: 8e0ce35829 
Original change: https://android-review.googlesource.com/c/platform/build/+/3113080

Change-Id: Ibff56dd869895c5bf1cb77190d91aff6e026e81b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 01:47:19 +00:00
Treehugger Robot
8e0ce35829 Merge "Include sdk-preprocess-files.mk before process sdk.atree" into main 2024-06-06 01:28:13 +00:00
Cole Faust
154682ce06 Merge "Remove all VNDK deprecation flags" into main am: b20aee1b1e 
Original change: https://android-review.googlesource.com/c/platform/build/+/3109757

Change-Id: I6eb9b5aeff8293dddc9dc2d1941ad98a0f123532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-05 19:36:28 +00:00
Steven Moreland
33dc03bc09 Merge "Shipping_api_level" into main am: 62f6c088bf 
Original change: https://android-review.googlesource.com/c/platform/build/+/3112941

Change-Id: I0c711dc4642ec69d20755ce33ee03a555ae27d2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-05 19:36:09 +00:00
Cole Faust
b20aee1b1e Merge "Remove all VNDK deprecation flags" into main 2024-06-05 19:24:17 +00:00
Steven Moreland
62f6c088bf Merge "Shipping_api_level" into main 2024-06-05 19:23:21 +00:00
LaMont Jones
358a84d714 Merge "Allow product-specific release configs." into main am: 6a39bb136e 
Original change: https://android-review.googlesource.com/c/platform/build/+/3114502

Change-Id: I2bdfb6363ca1c7b60035fd2aa1dde7f5906918b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-05 00:22:52 +00:00
LaMont Jones
6a39bb136e Merge "Allow product-specific release configs." into main 2024-06-05 00:07:28 +00:00
Cole Faust
b5b8902b29 Merge "Remove unused variables in soong variables file" into main am: d816a727b8 
Original change: https://android-review.googlesource.com/c/platform/build/+/3114139

Change-Id: Ic95341bfc82d33b117ba760d9d87340873111085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-04 22:51:24 +00:00
Cole Faust
d816a727b8 Merge "Remove unused variables in soong variables file" into main 2024-06-04 22:23:09 +00:00
Treehugger Robot
9830e817d6 Merge "Reland "check_elf_file: check prebuilts are aligned"" into main am: 69e8c9be5f 
Original change: https://android-review.googlesource.com/c/platform/build/+/3110301

Change-Id: I53a7274547eb1731191a5ea4690d4627926f9e13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-04 21:47:36 +00:00
LaMont Jones
0ca61ddb25 Allow product-specific release configs. 
Bug: 343794062
Test: manual
Change-Id: Ieb47ce685c7f29c0e8afe8897f86ffebb6318396
 2024-06-04 14:26:49 -07:00
Cole Faust
58c46179b7 Remove unused variables in soong variables file 
Test: Presubmits
Change-Id: I9c303c4dab9ad18653cda7ca62ec8884d044bba0
 2024-06-04 11:10:59 -07:00
Steven Moreland
52c2371ae8 Reland "check_elf_file: check prebuilts are aligned" 
This reverts commit 411fb17537.

Reason for revert: reland after other targets are fixed b/342466032

Bug: 342466032
Test: build, w/ and w/o checking enabled

Change-Id: I830166faffec781cf6cc4fea47140a60b0a12466
 2024-06-04 17:26:12 +00:00
Jim Tang
39d190e7c3 Add license metadata declaration in device/generic/goldfish 
Bug: 343823190
Test: presubmit
Change-Id: I112061067ff7cb6dc6894a798dc4edf51918b5ea
 2024-06-04 22:22:45 +08:00
Herbert Xue
8a61b7f5ba Include sdk-preprocess-files.mk before process sdk.atree 
Bug: 336709919
Test: m sdk
Change-Id: Id0ad404f576478a6909eb440f3fb259606d57d02
 2024-06-04 20:05:11 +08:00
Nelson Li
fd6406c066 Convert appcompat.sh to a Python binary 
Previously, to use `appcompat.sh`, we hardcoded absolute paths for many
dependencies in the `build/core/definitions.mk` file, and the same was
done in `art/tools/veridex/Android.mk`.

This change converts `appcompat.sh` to `appcompat.py` and packages the
necessary files into a `Python binary`. This not only resolves the
issue of hardcoding absolute dependency paths but also allows users to
use the tool directly without having to specify dependency paths,
making it more convenient.

Bug: 343105310
Test: 1. m appcompat
      2. m CarrierConfig (any module with appcompat)
      3. appcompat --dex-file=<apk path>

Change-Id: I6215f42241f58ba7fc6f4ae5846c4b71d9c1be4f
 2024-06-04 03:34:27 +00:00
Steven Moreland
fb92bbdcd1 Shipping_api_level 
Make it pretty in blueprint.

Bug: 340953047
Test: N/A
Change-Id: I68d1e891578afe2581e760b6a025e8280c3cb833
 2024-06-04 03:21:07 +00:00
Ronald Braunstein
173298547b Merge "Reapply "Add soong installed files to general-tests.zip"" into main am: 68452cdcce 
Original change: https://android-review.googlesource.com/c/platform/build/+/3111079

Change-Id: I94c5fcd5952eaa54fc34f4ee9aba5933f25c43a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 23:03:07 +00:00