Commit Graph

92736 Commits

Author SHA1 Message Date
Treehugger Robot
60799bfa35 Merge "Retire emulator build files from build/make" into main am: e3dca814e3 am: 14a06f4c68
Original change: https://android-review.googlesource.com/c/platform/build/+/2816877

Change-Id: Id53deb1f7433f301e99a39cd1d331c555479a7d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 19:18:42 +00:00
Treehugger Robot
4ab268de12 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: I2d54ba35c9e83d9b397cb861b9fd2f6983557284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 18:51:20 +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
Treehugger Robot
e3dca814e3 Merge "Retire emulator build files from build/make" into main 2023-11-03 18:11:26 +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
05cd0cab41 Merge changes I2ca9e674,I7e0db3c0,I7e1b6268,I0fa6a46e,I04e8178a into main am: b5ec156b32 am: 0aa2a34d26
Original change: https://android-review.googlesource.com/c/platform/build/+/2815683

Change-Id: I543e90e14e40aea448591397fe716842892e8532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 16:21:29 +00:00
Colin Cross
4354a51b61 Merge changes I2ca9e674,I7e0db3c0,I7e1b6268,I0fa6a46e,I04e8178a into main am: b5ec156b32 am: 6281ca70d0
Original change: https://android-review.googlesource.com/c/platform/build/+/2815683

Change-Id: Ib37f1ad0121a47320e03faf41e9cfb24f6d00ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 16:19:01 +00:00
Colin Cross
0aa2a34d26 Merge changes I2ca9e674,I7e0db3c0,I7e1b6268,I0fa6a46e,I04e8178a into main am: b5ec156b32
Original change: https://android-review.googlesource.com/c/platform/build/+/2815683

Change-Id: If17d717883160e90a0aae19dbf2b6a8b12afcb0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 15:51:52 +00: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
4d8220f797 Merge "Include following files in the SBOM of layoutlib, which are disted in Soong." into main am: 581b781ac4 am: 26452946c5
Original change: https://android-review.googlesource.com/c/platform/build/+/2809912

Change-Id: I1a0884b08276668c51ad820b9b5ff62bc9cd5854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 23:19:18 +00:00
Wei Li
cee308e4f4 Merge "Include following files in the SBOM of layoutlib, which are disted in Soong." into main am: 581b781ac4 am: 60d2436635
Original change: https://android-review.googlesource.com/c/platform/build/+/2809912

Change-Id: Ia444aa5339e9b51170462c0218100cf177342064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 23:17:26 +00:00
Wei Li
26452946c5 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: Ib0f3825681ddff24501c0f0d3d998b5d691e9cee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 22:51:56 +00: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
Anas Sulaiman
192f64844a Merge "fix potential encoding issues in remote actions" into main am: 39ccc6378e am: 9a22984fb9
Original change: https://android-review.googlesource.com/c/platform/build/+/2814613

Change-Id: I72d8004550f16b557ff2688118daa97ce33345d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 18:52:08 +00:00
Anas Sulaiman
98f548c3e9 Merge "fix potential encoding issues in remote actions" into main am: 39ccc6378e am: 78bbac7d51
Original change: https://android-review.googlesource.com/c/platform/build/+/2814613

Change-Id: I927d63a80e44e3ee331ecd1223fe7f36119290d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 18:49:40 +00:00
Anas Sulaiman
9a22984fb9 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: I6a7e03f15c3b242d33b8dda443a5b7f2ecedc49b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 18:23:38 +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
Peiyong Lin
b7a6324a31 Merge "Make ANGLE part of Android OS system image." into main am: 492220c695 am: 11edb41b75
Original change: https://android-review.googlesource.com/c/platform/build/+/2693296

Change-Id: Iebec59f4db1066d0566e17f330947ff9b7a42e4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 18:14: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
Peiyong Lin
42d4ba096f Merge "Make ANGLE part of Android OS system image." into main am: 492220c695 am: 0750e0bd17
Original change: https://android-review.googlesource.com/c/platform/build/+/2693296

Change-Id: I8151e58b47c18e414787512d5487457987cb8251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 17:41:59 +00: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
0750e0bd17 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: Ife40b8f5563ebf220fd192ddcb26e5a1fefb1a77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 16:47:08 +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
89deeb9ad2 Merge changes from topic "revert-2787001-product-build-flags-PYFTWILGBK" into main am: 821ab221be am: 65793a4a9a
Original change: https://android-review.googlesource.com/c/platform/build/+/2813823

Change-Id: Ifc4d64727f11012034ca41b437994f824ddac291
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 09:12:40 +00:00
Treehugger Robot
d00589f45f Merge changes from topic "revert-2787001-product-build-flags-PYFTWILGBK" into main am: 821ab221be am: 04d56713b8
Original change: https://android-review.googlesource.com/c/platform/build/+/2813823

Change-Id: Ia46fb197af1f86def3db9da834c242498ad24828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 09:10:21 +00:00
Treehugger Robot
65793a4a9a 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: I62ba86922b59abe4413c6f439afbb762c5b6cb0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 08:46:12 +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
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ó
d9a6eef757 Merge "Revert^2 "aconfig: cache flag value in generated java code"" into main am: 8b1d74ec60 am: 206d0dff4c
Original change: https://android-review.googlesource.com/c/platform/build/+/2812934

Change-Id: I273686c99e5ab36dce319f96a93615d74e9c2787
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 23:06:41 +00:00
Oriol Prieto Gascó
9102c01125 Merge "Revert^2 "aconfig: cache flag value in generated java code"" into main am: 8b1d74ec60 am: c0f5f0c696
Original change: https://android-review.googlesource.com/c/platform/build/+/2812934

Change-Id: I849d93a9becdc21affe996790ae2b5fc32965553
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 23:02:56 +00:00
Oriol Prieto Gascó
206d0dff4c 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: I08854df4cf77fbe85201f925e630ef6bf412efab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 22:37:08 +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
20a9157544 Merge "Convert partition size to int before CheckSize" into main am: be56ac9aad am: f4987fc990
Original change: https://android-review.googlesource.com/c/platform/build/+/2812782

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

Change-Id: I554b39add7ba6f7042796889b9cc1125c8a84cb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 19:41:48 +00:00