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

37476 Commits

Author SHA1 Message Date
Treehugger Robot
7b7c602bf2 Merge "Allow experimental use of Java 21 by default in makefiles" into main am: 0aeb964be8 am: f3aab9de59 
Original change: https://android-review.googlesource.com/c/platform/build/+/3125236

Change-Id: I3b2fbc5778f93013f7bce95a7e572e9c1b502b8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-13 19:27:18 +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
Treehugger Robot
2272f73be4 Merge "Shift the preprocess mk before build emulator packages" into main am: 9566130852 am: 03468748d3 
Original change: https://android-review.googlesource.com/c/platform/build/+/3128074

Change-Id: Ifc53cab5d2003963d77fcdafef52212fdfe72c5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-13 08:44:06 +00: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
1b6940c175 Merge "Move license metadata declaration of bramble/Android.mk into meta-lic.mk" into main am: f94c02c7f3 am: c17b8e9aa6 
Original change: https://android-review.googlesource.com/c/platform/build/+/3127554

Change-Id: Ia0d68d147b21ab878d3d6a24197307b5e0e1747d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-13 02:51:19 +00: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
Treehugger Robot
402b9a476f Merge "Convert appcompat.sh to a Python binary" into main am: 3dcc84df5c am: 200880c0b7 
Original change: https://android-review.googlesource.com/c/platform/build/+/3106579

Change-Id: Ie88312e551afb32262c7de40fddbdaa63ec491b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-13 01:43:42 +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
Lance Chang
7c282854f3 Change TARGET_BUILD_APPS_WITH_BUILD_NUMBER to a product variable 
This change allows unbundled app builds to embed the build number in the
version name by defining PRODUCT_BUILD_APPS_WITH_BUILD_NUMBER, so that
APK files from a build can be easily identified.

Ignore-AOSP-First: changes in topics with internal-only projects
Test: manual build
Bug: 340311907
Change-Id: If7feda5eec2bc1e54a90b4adae1bd6da19e3ea45
 2024-06-10 22:27:42 -07:00
Lance Chang
eda8686794 Add build number if TARGET_BUILD_APPS_WITH_BUILD_NUMBER is defined 
This change allows unbundled app builds to embed the build number in the
version name by defining TARGET_BUILD_APPS_WITH_BUILD_NUMBER, so that
APK files from a build can be easily identified.

Ignore-AOSP-First: changes in topics with internal-only projects
Test: manual build
Bug: 340311907
Change-Id: I9a7e4f96f0d92c19d832933b5c68bd6b75ce9ce6
 2024-06-09 13:22:58 -07:00
Treehugger Robot
6fd890a5e5 Merge "Add license metadata declaration in device/generic/goldfish" into main am: a96b36bd9f am: fc9567c25b 
Original change: https://android-review.googlesource.com/c/platform/build/+/3113262

Change-Id: I32983f131d32c1519e52daba6f7b879c3fa17ff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-08 02:42:57 +00: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
c75273461d Merge "Add support to disable adb root on userdebug builds based on product config" into main am: 878141b810 am: 812d3e988c 
Original change: https://android-review.googlesource.com/c/platform/build/+/3118597

Change-Id: I2f91943b5045dc3ac89eb1ddcec0c5e3de811f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-08 01:09:14 +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
a8fb229469 Merge "Fix expansion of _include_stack in _import-node" into main am: 7120481a00 am: e48e393a12 
Original change: https://android-review.googlesource.com/c/platform/build/+/3119358

Change-Id: Ic1b29682425660bd6d975e7ea9e11f1a2affb8a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 23:56:33 +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
653237c2a4 Merge "Prevent implicit outputs created during dexpreopt_config.zip" into main am: d7c448f0f7 am: cc4e318dce 
Original change: https://android-review.googlesource.com/c/platform/build/+/3117879

Change-Id: I505bb16d818082d2abd62a0e278f10d2d1110713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 22:06:35 +00: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
Tongbo Liu
55b92a6726 Merge "fix wrong mts folder issue" into main 2024-06-07 17:02:49 +00:00
Treehugger Robot
b4cf9be5fb Merge "Build build_flags.json in soong" into main am: 04837c61f3 am: 4401accfe0 
Original change: https://android-review.googlesource.com/c/platform/build/+/3011233

Change-Id: I6e32f3b30d749b092f71ab6fd6bcc736605cca2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 05:50:40 +00:00
Yihan Dong
b89bb9d547 fix wrong mts folder issue 
Bug: 345042907
Test: m mts-mainline-infra
Ignore-AOSP-First: For internal use

Change-Id: I457403b0f9b50179d7b6ca9e13d1040b2a039b54
 2024-06-07 05:31:20 +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
adbe658f63 Merge "Drop product config include tags" into main am: 27d977e49b am: 4203b5baa7 
Original change: https://android-review.googlesource.com/c/platform/build/+/3098637

Change-Id: Ieff76d73c26a1470bc99d8fc120a9f4dbb680d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 22:38:46 +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
7e008bd5b9 Merge "Propagate libpower no lock during binder transaction flag to soong" into main am: eae45e70ca am: c39e47f792 
Original change: https://android-review.googlesource.com/c/platform/build/+/3107745

Change-Id: I5694cb1b306b465489002590fad5273af339a5fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 04:30:37 +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
283f582176 Merge "Include sdk-preprocess-files.mk before process sdk.atree" into main am: 8e0ce35829 am: b8e6e297e3 
Original change: https://android-review.googlesource.com/c/platform/build/+/3113080

Change-Id: I06ffb2cc58ae522e10a441ccfe14a44456d0936b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 02:01: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
06f09f1e32 Merge "Remove all VNDK deprecation flags" into main am: b20aee1b1e am: 154682ce06 
Original change: https://android-review.googlesource.com/c/platform/build/+/3109757

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

Change-Id: I93b3c9c5f25a256ca7e313298761589992ebe7b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-05 20:00:38 +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