Commit Graph

92890 Commits

Author SHA1 Message Date
Handa Wang
69a637ed9b Merge "add ot-cli-ftd in /system/bin/ for eng and userdebug builds" into main am: 8f1f35461e
Original change: https://android-review.googlesource.com/c/platform/build/+/2817055

Change-Id: If3465c220ed3ffd4c64953671e8d1d4a9d946860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 09:07:35 +00:00
Handa Wang
8f1f35461e Merge "add ot-cli-ftd in /system/bin/ for eng and userdebug builds" into main 2023-11-06 08:18:55 +00:00
Kiyoung Kim
ae5e1b7bb0 Deprecate VNDK based on feature flag
A new feature flag RELEASE_DEPRECATE_VNDK is added to control VNDK
deprecation. Use this value to decide whether VNDK should be deprecated,
and keep it overridable with command for now.

Bug: 301346137
Test: Checked if aosp_cf_x86_64_phone-trunk_staging is VNDK deprecated
Change-Id: Ib9bb48fbfb14d1ab87f939439da4f23e364d1173
2023-11-06 07:30:57 +00:00
Justin Yun
7094ed249f Merge "Set ro.product.vndk.version for VNDK v35" into main am: 2071b4eac2
Original change: https://android-review.googlesource.com/c/platform/build/+/2814675

Change-Id: I12f97e2b16d285350618843e640bf5762eb6fdbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-05 08:00:15 +00:00
Justin Yun
2071b4eac2 Merge "Set ro.product.vndk.version for VNDK v35" into main 2023-11-05 07:16:14 +00:00
Treehugger Robot
14a06f4c68 Merge "Retire emulator build files from build/make" into main am: e3dca814e3
Original change: https://android-review.googlesource.com/c/platform/build/+/2816877

Change-Id: I491a39931966538d5675f4eb2adffb89d0d5411c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 18:48:11 +00:00
Android Build Coastguard Worker
8cb4cf1319 [coastguard skipped] Merge sparse cherrypicks from sparse-11049176-L05200030000080823 into udc-qpr1-release.
COASTGUARD_SKIP: Ide91ad77514963fae27ceedc72e500cb086ffdb2

Change-Id: I619510d7f54fd63dfb60df2e1d9f9ad61d9079a0
2023-11-03 18:12:02 +00:00
Treehugger Robot
e3dca814e3 Merge "Retire emulator build files from build/make" into main 2023-11-03 18:11:26 +00:00
Android Build Coastguard Worker
9457b944de Version bump to UQ1A.231205.014.A1 [core/build_id.mk]
Change-Id: Ide91ad77514963fae27ceedc72e500cb086ffdb2
2023-11-03 18:09:38 +00:00
Android Build Coastguard Worker
3d7a061cd7 Version bump to UQ1A.231205.014 [core/build_id.mk]
Change-Id: I72a38923ed2e5b5941f0b3d6e92bd315aa9de75c
2023-11-03 17:43:47 +00:00
Roman Kiryanov
e662209bee Retire emulator build files from build/make
they were moved to device/generic/goldfish

Bug: 295259752
Test: presubmit
Change-Id: I996811e8703b43313fca3ac819e6ed333d37866b
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-11-03 10:07:03 -07:00
Colin Cross
6281ca70d0 Merge changes I2ca9e674,I7e0db3c0,I7e1b6268,I0fa6a46e,I04e8178a into main am: b5ec156b32
Original change: https://android-review.googlesource.com/c/platform/build/+/2815683

Change-Id: Idb5090bac0f699ab0661d903b03a929d57ec0e82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 15:49:27 +00:00
Colin Cross
b5ec156b32 Merge changes I2ca9e674,I7e0db3c0,I7e1b6268,I0fa6a46e,I04e8178a into main
* changes:
  Remove code related to unused LOCAL_* variables
  Delete unused variables from clear_vars.mk
  Remove obsolete ide.mk and related code
  Removed unused license code
  Remove obsolete uses of LOCAL_MODULE_TAGS
2023-11-03 15:27:34 +00:00
Handa Wang
cf72ecf193 add ot-cli-ftd in /system/bin/ for eng and userdebug builds
`ot-cli-ftd` is a CLI tool simulating a node in Thread network. See https://www.threadgroup.org/ about Thread networking technology.

It's currently in `/vendor/bin/` but we're moving it to `/system/bin/` because `ot-cli-ftd` will be used in various CI tests.

`ot-cli-ftd` is also useful for debugging purpose.

Bug: 309051262
Test: Verified on Cuttlefish.

Change-Id: I96bf2bd7575540dc86e969a80cd9bb5634c3a1ea
2023-11-03 06:49:51 +00:00
Colin Cross
00d65a01a5 Skip parts of notice_files.mk that don't apply to Soong modules
Move the parts of notice_files.mk that set variables that are only
used for Make modules inside the conditional on
LOCAL_SOONG_LICENSE_METADATA.

Bug: 309006256
Test: no change to out/build-aosp_cf_x86_64_phone.ninja
Change-Id: I5dc5a4ed223c6c2cb13460f59d0e7a03d4c9d097
2023-11-02 19:48:46 -07:00
Wei Li
60d2436635 Merge "Include following files in the SBOM of layoutlib, which are disted in Soong." into main am: 581b781ac4
Original change: https://android-review.googlesource.com/c/platform/build/+/2809912

Change-Id: I28c66a4dc0364bcb763591a90aae2f384f46c307
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 22:49:52 +00:00
Wei Li
581b781ac4 Merge "Include following files in the SBOM of layoutlib, which are disted in Soong." into main 2023-11-02 22:17:30 +00:00
Android Build Coastguard Worker
f9d7bcb798 [coastguard skipped] Merge sparse cherrypicks from sparse-11044053-L79500030000063296 into udc-qpr1-release.
COASTGUARD_SKIP: Ic7b46ac7258723e5751eb385188c788276eefe26

Change-Id: I5d526fd1fcba022578968846c14faf40f592bba1
2023-11-02 20:57:15 +00:00
Android Build Coastguard Worker
a284c9a6de Version bump to UQ1A.231205.013.A1 [core/build_id.mk]
Change-Id: Ic7b46ac7258723e5751eb385188c788276eefe26
2023-11-02 20:54:18 +00:00
Android Build Coastguard Worker
fa79f382ba Version bump to UQ1A.231205.013 [core/build_id.mk]
Change-Id: I962b7ceaa53ff4961bb781fb859a5ef9bd0e70c9
2023-11-02 20:26:50 +00:00
Anas Sulaiman
78bbac7d51 Merge "fix potential encoding issues in remote actions" into main am: 39ccc6378e
Original change: https://android-review.googlesource.com/c/platform/build/+/2814613

Change-Id: I1a036f07e5d8c39ec4abfbb200b780b9cc8322b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 18:20:41 +00:00
Anas Sulaiman
39ccc6378e Merge "fix potential encoding issues in remote actions" into main 2023-11-02 18:02:55 +00:00
Peiyong Lin
11edb41b75 Merge "Make ANGLE part of Android OS system image." into main am: 492220c695
Original change: https://android-review.googlesource.com/c/platform/build/+/2693296

Change-Id: Ic3217d68f7aa51ff40895a2fccaeb3625390c45e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 17:45:51 +00:00
Colin Cross
710c3cb5fb Remove code related to unused LOCAL_* variables
LOCAL_JETIFIER_ENABLED, LOCAL_NO_PIC, LOCAL_PREBUILT_STRIP_COMMENTS,
LOCAL_RMTYPEDEFS, and *.vts sources are never used.  Remove them
and the code related to them.

Test: no change to out/build-aosp_cf_x86_64_phone.ninja
Change-Id: I2ca9e674602057cc163b8bc28b0c57a0b7cc4361
2023-11-02 10:45:33 -07:00
Colin Cross
fda3c6a36a Delete unused variables from clear_vars.mk
Kati analysis in AOSP spends around 6 seconds in clear_vars.mk.
Delete any variables in clear_vars.mk that are not referenced anywhere
else in build/make/core.

Test: no change to build-aosp_cf_x86_64_phone.ninja
Change-Id: I7e0db3c02d297de825acbfbd1a0f05724d1e846d
2023-11-02 10:33:25 -07:00
Colin Cross
1b7f072505 Remove obsolete ide.mk and related code
The code to generate an eclipse classpath is obsolete, remove it and
related code.

Test: no change to out/build-aosp_cf_x86_64_phone.ninja
Change-Id: I7e1b6268b98ecbb7be88db8945dd7b30acc695ba
2023-11-02 10:16:57 -07:00
Colin Cross
34fe77a493 Removed unused license code
Nothing ever reads ALL_DEPS.*.LICENSE, and its an ever-growing list
that is sorted every time, which is extremely expensive.

notice_target is never set after I4cddf9a381a1258bdc2b1b42be72c447df10d234,
remove all the related code.

Test: no change to out/build-aosp_cf_x86_64_phone.ninja
Change-Id: I0fa6a46e62ef8aa78873b43d3064b57b1c54de51
2023-11-02 10:10:36 -07:00
Colin Cross
aed37d79f2 Remove obsolete uses of LOCAL_MODULE_TAGS
Only LOCAL_MODULE_TAGS := tests is used is meaningful in the current
implementation.  "optional" and "samples" both exist in the tree, but
are meaningless.  "gnu", "user", "eng" and "debug" are  no longer used,
and are already forbidden by the unusual tags check.  The info from the
"module" target is now available in module-info.json.  Delete all the
irrelevant code.

Test: no change to out/build-aosp_cf_x86_64_phone.ninja
Change-Id: I04e8178a362e382a1a4bd997c1b4c3a480db7714
2023-11-02 10:10:06 -07:00
Greg Kaiser
9a5a526257 Fix example lunch target
We make this example valid for trunk stable.

Bug: 307738446
Test: lunch command
Change-Id: I25a142f1b87facebdcf2751f3f4cb68a0738945d
2023-11-02 16:59:23 +00:00
Peiyong Lin
492220c695 Merge "Make ANGLE part of Android OS system image." into main 2023-11-02 16:34:05 +00:00
LaMont Jones
eacc292ce8 Reapply "release_config: build flags can be lists"
Allow a build flag definition to indicate that its value should be the
concatentation of assignements, rather than the final assigned value. In
this case, the "default" value from the flag definition is always
present as the start of the list.

The initial use case for this is RELEASE_ACONFIG_VALUE_SETS, where we
need apply multiple definition files that should be processed to arrive
at the final value.

This reverts commit b05eaac092.

Bug: b/302593603, b/304814040
Test: manual

Change-Id: I7370c509ceb3952f7feb2351673d8f2ba86d704b
2023-11-02 15:56:10 +00:00
LaMont Jones
df398d19d4 Reapply "Add support for product-specific build flags"
1. release config maps now specify where the flag definitions are found.
2. PRODUCT_RELEASE_CONFIG_MAPS specifies additional release config map
   files to use.

This allows product config to specify build flags, which can then be
specified by users of that product.

This reverts commit 75bfc37ef4.

Bug: b/302593603
Test: manual
Change-Id: I031a00459893644d7f67b63b982db9ae9015ae4d
2023-11-02 15:56:03 +00:00
Treehugger Robot
04d56713b8 Merge changes from topic "revert-2787001-product-build-flags-PYFTWILGBK" into main am: 821ab221be
Original change: https://android-review.googlesource.com/c/platform/build/+/2813823

Change-Id: Ic660577b64ed322428d33dfd03574f0830cfc6e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 08:44:33 +00:00
Treehugger Robot
821ab221be Merge changes from topic "revert-2787001-product-build-flags-PYFTWILGBK" into main
* changes:
  Revert "Add support for product-specific build flags"
  Revert "release_config: build flags can be lists"
2023-11-02 08:06:39 +00:00
Justin Yun
925d1f517c Set ro.product.vndk.version for VNDK v35
Until we have updated art mainline module, we must provide
ro.product.vndk.version to use product namespace for product apks.

This can be removed when art mainline module is updated.

Bug: 308676119
Test: See if product apps uses product-clns namespace in
      cf_x86_64_phone-next-userdebug
Change-Id: I5030fb0f82c80e0cb94c89179e6c71df119368da
2023-11-02 11:48:39 +09:00
Android Build Coastguard Worker
2e85595990 [coastguard skipped] Merge sparse cherrypicks from sparse-11030841-L28900030000046249 into udc-qpr1-release.
COASTGUARD_SKIP: I8fc290212ddb7fcc9c2eea0304f944243768e6df

Change-Id: Ic542b592b619ce51054085c0b39ec2dcb3c89d2b
2023-11-02 01:50:28 +00:00
Android Build Coastguard Worker
920f7967e3 Version bump to UQ1A.231205.012.A1 [core/build_id.mk]
Change-Id: I8fc290212ddb7fcc9c2eea0304f944243768e6df
2023-11-02 01:47:40 +00:00
Colin Cross
75bfc37ef4 Revert "Add support for product-specific build flags"
Revert submission 2787001-product-build-flags

Reason for revert: Possible cause of b/308849337

Reverted changes: /q/submissionid:2787001-product-build-flags

Bug: 302593603
Bug: 308849337
Change-Id: I01b5905a0a20a1401dcc1267e7fafc893e57d637
2023-11-02 00:13:30 +00:00
Colin Cross
b05eaac092 Revert "release_config: build flags can be lists"
Revert submission 2787001-product-build-flags

Reason for revert: Possible cause of b/308849337

Reverted changes: /q/submissionid:2787001-product-build-flags

Bug: 302593603
Bug: 308849337
Change-Id: I6246d20201e674ba99faf6b880ecdc7ef934c653
2023-11-02 00:13:32 +00:00
Oriol Prieto Gascó
c0f5f0c696 Merge "Revert^2 "aconfig: cache flag value in generated java code"" into main am: 8b1d74ec60
Original change: https://android-review.googlesource.com/c/platform/build/+/2812934

Change-Id: I35ac2b7ef31eb70ebe218996ee91a406cde8b548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 22:34:44 +00:00
Oriol Prieto Gascó
8b1d74ec60 Merge "Revert^2 "aconfig: cache flag value in generated java code"" into main 2023-11-01 21:56:38 +00:00
Treehugger Robot
f4987fc990 Merge "Convert partition size to int before CheckSize" into main am: be56ac9aad
Original change: https://android-review.googlesource.com/c/platform/build/+/2812782

Change-Id: I08fac94e42457ef5838b6f8a19c41d046086939a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 19:16:01 +00:00
Treehugger Robot
66f8b0bfd2 Merge "Fix prebuilt boot image hermetic build" into main am: 5f4a51ef66
Original change: https://android-review.googlesource.com/c/platform/build/+/2813275

Change-Id: I2edea3a5ae786b1c79007d3ea8000fd16a054f09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 19:13:51 +00:00
Treehugger Robot
be56ac9aad Merge "Convert partition size to int before CheckSize" into main 2023-11-01 18:22:13 +00:00
Treehugger Robot
5f4a51ef66 Merge "Fix prebuilt boot image hermetic build" into main 2023-11-01 18:22:10 +00:00
Ronald Braunstein
ee60ee46b8 Merge "Add banner announcing adevice when running builds." into main am: 75b114560a
Original change: https://android-review.googlesource.com/c/platform/build/+/2809900

Change-Id: Ia5ad43dc9c5477622bd4a7cbf5ae94582941f5f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 18:21:13 +00:00
Peiyong Lin
71af449630 Make ANGLE part of Android OS system image.
As ANGLE will become the default GLES drivers and by shipped by Google,
this patch allows ANGLE to be built into Android OS image.

Bug: b/293503000
Test: atest CtsAngleDeveloperOptionHostTest -c with ANGLE being default
Test: atest CtsAngleDeveloperOptionHostTest -c with native being default
Change-Id: I72aa4e126916419d2350a4ce980bd33cb4537c73
2023-11-01 18:20:33 +00:00
Ronald Braunstein
75b114560a Merge "Add banner announcing adevice when running builds." into main 2023-11-01 17:54:03 +00:00
Ted Bauer
aac619afb2 Merge "Revert^2 "Do not generate aconfig_flags.textproto"" into main am: ad2c02c98d
Original change: https://android-review.googlesource.com/c/platform/build/+/2812935

Change-Id: I07bb33da126c586d5148a6843c12b820f6c6940c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 17:48:00 +00:00
Anas Sulaiman
b72060b029 fix potential encoding issues in remote actions
The new docker image contains all en_*.UTF-8 locales to ensure Java (and
other) actions produce the correct bytes.

Bug: b/300624128
Test: Ran an android build and verified there are no encoding issues in
metalava outputs.

Change-Id: Id1eab37edfc71b3b56f4ac38259407c0a1b10667
2023-11-01 17:41:34 +00:00