Commit Graph

907 Commits

Author SHA1 Message Date
Treehugger Robot
5d2439b3b1 Merge "Revert "Revert "Enable from-text stub generation in non-sdk java..."" into main am: 4f18cfdd7d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3205865

Change-Id: I7815c3207e9d41df6e581be31ce3ec1948f7cdba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 19:06:28 +00:00
Treehugger Robot
4f18cfdd7d Merge "Revert "Revert "Enable from-text stub generation in non-sdk java..."" into main 2024-08-06 18:50:04 +00:00
Treehugger Robot
59f0d23ff6 Merge "Add system_ext support to build_prop module" into main am: 32b8daff1d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3204632

Change-Id: I1f401c480670cd8ddacd351fc5ea5fb8f01fc6a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 10:15:58 +00:00
Treehugger Robot
fc413ce622 Merge "Hide unflagged mainline prebuilts with missing source." into main am: 9b10ca4711
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3203370

Change-Id: Idbd05e89c743e0b669092a0f77a1d70ebdfb350e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 10:15:41 +00:00
Jihoon Kang
ad5e953a7d Merge "Revert "Enable from-text stub generation in non-sdk java_sdk_library"" into main am: f6d9965cc5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3207397

Change-Id: I46b1257ff9b15143ebed6c3a3e36db5d2617acf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 10:14:59 +00:00
Treehugger Robot
696cea31d3 Merge "Enable from-text stub generation in non-sdk java_sdk_library" into main am: 99417ba9ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2983176

Change-Id: I01a3955f2c44dddff31a0b61bf18af34d243856e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 10:09:34 +00:00
Treehugger Robot
32b8daff1d Merge "Add system_ext support to build_prop module" into main 2024-08-06 02:00:28 +00:00
Jihoon Kang
b0f4c0239d Revert "Revert "Enable from-text stub generation in non-sdk java..."
Revert submission 3207397-revert-2982300-java_api_library_non_sdk-FIKZOSARQI

Reason for revert: Post submit build breakage culprit fixed

Reverted changes: /q/submissionid:3207397-revert-2982300-java_api_library_non_sdk-FIKZOSARQI

Change-Id: Ic79b7fd074f02febba94183cb1479874efe044b5
2024-08-06 00:15:25 +00:00
Treehugger Robot
9b10ca4711 Merge "Hide unflagged mainline prebuilts with missing source." into main 2024-08-05 23:10:53 +00:00
Jihoon Kang
f6d9965cc5 Merge "Revert "Enable from-text stub generation in non-sdk java_sdk_library"" into main 2024-08-05 20:51:31 +00:00
Liana Kazanova
a574cd28a8 Revert "Enable from-text stub generation in non-sdk java_sdk_library"
Revert submission 2982300-java_api_library_non_sdk

Reason for revert: DroidMonitor: Potential culprit for b/357648959 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:2982300-java_api_library_non_sdk

Change-Id: I5ef7afd9ec3e10ea99f82d02172843ad9b2cfda9
2024-08-05 19:45:03 +00:00
Spandan Das
85bd4625ed Hide unflagged mainline prebuilts with missing source.
Partner worksapces contain two versions of mainline prebuilts - BigAndroid
and Go. These two prebuilts export dexpreopt'd system server artifacts
to be installed in system image. Since the install paths are same, we
run into duplicate installation rules issue unless one of them is
hidden.

This hiding was previously done by creating a dependendency between
source aosp apex to BA and Go google prebuilts. However, this
implementaion had the unfortunate side effect on the packaging name of
the Google mainline prebuilts - the name becomes the aosp apex name.

Instead of creating the dependency to aosp apex, this CL hides all
mainline apex_set(s) if it has not been flagged using
RELEASE_APEX_CONTRIBUTIONS_*. Since there are some non mainline apex
prebuilts, apex_name will be used to determine whether the prebuilt is a
mainline module.

Test: m nothing --no-skip-soong-tests
Test: In partner workspaces, downloaded the CLs in b/355682304#comment7
Test: m out/target/product/generic/obj/PACKAGING/system_intermediates/file_list.txt
verified that aosp apexes are not installed, but mainline prebuilts are
installed

Test: unset RELEASE_APEX_CONTRIBUTIONS_ADSERVICES to build from source
Test: m out/target/product/generic/obj/PACKAGING/system_intermediates/file_list.txt
verified that aosp adservices is installed, and adservices prebuilt is
**not* installed.

Bug: 355682304
Change-Id: Idacb65313553bdea5c0593976694de478034229e
2024-08-05 18:25:37 +00:00
Treehugger Robot
99417ba9ea Merge "Enable from-text stub generation in non-sdk java_sdk_library" into main 2024-08-05 18:25:36 +00:00
Inseob Kim
acf9174120 Add system_ext support to build_prop module
As some partitions have build.prop under etc/, this change adds
relative_install_path property to build_prop module. Also this change
adds system_ext related Soong variables and system_ext support in
gen_build_prop.py.

Bug: 322090587
Test: build and compare system_ext/etc/build.prop
Change-Id: I416662b8bae09383af0cdd3d8444a5c300006b7b
2024-08-05 12:51:05 +09:00
Inseob Kim
db166effa0 Revert^2 "Conditionally pass kernel version to build.prop" am: 6bd92d5924
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3199371

Change-Id: I47dd45bd74c11e604b17ee195f95a6e2575a23b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-01 00:05:16 +00:00
Inseob Kim
6fb79d21f5 Revert^6 "Add TARGET_SYSTEM_PROP to system build.prop" am: d8538e5db0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3201030

Change-Id: Ic6b0119e38b0c7e7592735289553e8e60e3c86ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-01 00:05:13 +00:00
Inseob Kim
6bd92d5924 Revert^2 "Conditionally pass kernel version to build.prop"
This reverts commit 29fed1efe8.

Reason for revert: Fixed breakage with aosp/3200730, verified with ABTD

Change-Id: I207abd188636673250eb9a070be95db0b82f39e7
2024-07-31 02:17:49 +00:00
Inseob Kim
d8538e5db0 Revert^6 "Add TARGET_SYSTEM_PROP to system build.prop"
530c32acbe

Change-Id: I9dc817855e3db7b96320a977b24b84d72e762893
2024-07-31 02:17:39 +00:00
Liana Kazanova
329f004d5f Revert^5 "Add TARGET_SYSTEM_PROP to system build.prop" am: 530c32acbe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3200273

Change-Id: I0c5a05a15eb9a16b5dddeff28ea11da211f787cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-30 23:51:09 +00:00
Liana Kazanova
530c32acbe Revert^5 "Add TARGET_SYSTEM_PROP to system build.prop"
26756a86c1

Change-Id: Iad186b283ea78477c33bfc4519b9a27395557b55
2024-07-31 08:26:38 +09:00
Liana Kazanova
6a64398e2f Merge "Revert "Conditionally pass kernel version to build.prop"" into main am: 2426d49060
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3199691

Change-Id: If8341d7a6a57d1e98116f899735dd37c794bf0b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-30 23:09:24 +00:00
Liana Kazanova
2426d49060 Merge "Revert "Conditionally pass kernel version to build.prop"" into main 2024-07-30 22:53:16 +00:00
Jihoon Kang
062eb663c5 Enable from-text stub generation in non-sdk java_sdk_library
This change allows from-text stubs to be generated for all
java_sdk_library modules, unlike how it is currently limited to the
modules that contribute to the api surfaces (i.e. the SDK).

This change accomplish this by modifying the dependency of the
from-text stubs generation, so that the sdk_library generated from-text
stubs generating java_api_library modules no longer depend on the full
api surface stubs, but generate the stubs in the module level, and
combined later to generate the full api surface stubs.

This change also removes the java_api_library modules defined in
core-libraries/Android.bp, which are passed to generate the system
modules. Given that the from-text vs from-source toggle is done within
the java_sdk_library stubs level, these modules no longer need to exist.

Implementation details:
- Allow sdk_version to be specified in java_api_library modules. For
  java_sdk_library-generated java_api_library modules, they inherit that
  of the sdk_library module. Some java_sdk_library modules that do not
  contribute to the api surface are allowed to set sdk_version to
  something other than "none" or "core".
- Implement java_api_library to implement `SdkContext`. This allows
  java_api_library to collect required deps from sdk_version (classpath,
  bootclasspath, system modules), and pass the collected jars when
  generating the stubs srcjar in metalava and compiling the stubs srcjar
  in javac.
- Remove hardcoded list of sdk_library modules that are allowed to
  genereate stubs from the api signature files, and allow from-text
  stubs generation by default. Modules that are not able to generate
  stubs from the api signature files are specified by setting the newly
  introduced `Build_from_text_stubs` property to `false`.

Test: ENABLE_HIDDENAPI_FLAGS=true m
Bug: 327507877
Change-Id: Ia35d2f3cf9fae48fc8c4bd99a84ae18d7c0e7bee
2024-07-30 22:35:06 +00:00
Liana Kazanova
29fed1efe8 Revert "Conditionally pass kernel version to build.prop"
This reverts commit 036d9e6744.

Reason for revert: DroidMonitor: Potential culprit for b/356297315 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I58f1e43978eb812004d2e46fa7ce402e164d2800
2024-07-30 17:58:19 +00:00
Inseob Kim
bda41dcd88 Merge changes from topic "revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA" into main am: e1234e51b8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3196490

Change-Id: Id58ae1f6413c3ff96c5b4460b733a68ce1075de3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-30 04:13:54 +00:00
Inseob Kim
9e6c42e3c1 Revert^4 "Add TARGET_SYSTEM_PROP to system build.prop" am: 26756a86c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3195647

Change-Id: I3c161aa680e78b07ec39f927f03f287594ebbfdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-30 04:13:42 +00:00
Inseob Kim
e1234e51b8 Merge changes from topic "revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA" into main
* changes:
  Conditionally pass kernel version to build.prop
  Revert^4 "Use Soong-built system/build.prop"
  Revert^4 "Sync gen_build_prop.py to sysprop.mk"
  Revert^4 "Add TARGET_SYSTEM_PROP to system build.prop"
  Revert^2 "Set output for build_prop even on Soong only build"
2024-07-30 03:51:03 +00:00
Taylor Santiago
ba479256d1 Merge "Add ABFS (Android Build Filesystem) configuration option to Soong" into main am: dd65d3e672
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137581

Change-Id: I287da1a41d8432da2761c2d4c6169df9093d09cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 21:39:29 +00:00
Taylor Santiago
dd65d3e672 Merge "Add ABFS (Android Build Filesystem) configuration option to Soong" into main 2024-07-25 21:04:06 +00:00
Inseob Kim
036d9e6744 Conditionally pass kernel version to build.prop
This is to replicate Makefile's behavior as-is.

Bug: 322090587
Test: build and compare build command
Change-Id: Ib9ebec920701ea561a007bf2a1ae092ae1b4ff28
2024-07-25 20:15:54 +09:00
Inseob Kim
26756a86c1 Revert^4 "Add TARGET_SYSTEM_PROP to system build.prop"
072c0e4fcb

Change-Id: I53a36f415a9bd472170f030f115039e623769acf
2024-07-25 10:58:08 +00:00
Pechetty Sravani (xWF)
b7a0fe1eb7 Revert^3 "Add TARGET_SYSTEM_PROP to system build.prop" am: 072c0e4fcb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3195813

Change-Id: Iea8d428d6b6099c1b71a70450880c7ac926009be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 10:39:03 +00:00
Pechetty Sravani (xWF)
072c0e4fcb Revert^3 "Add TARGET_SYSTEM_PROP to system build.prop"
ff506d1af2

Change-Id: I5659e93d4c45fdca20357b4fc61f936cfd0e748d
2024-07-25 09:21:09 +00:00
Inseob Kim
66f64cbca0 Revert^2 "Add TARGET_SYSTEM_PROP to system build.prop" am: ff506d1af2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3195638

Change-Id: I258cf8b600cce98a3821b6fdd0d6d152bf6de1d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 07:39:28 +00:00
Inseob Kim
ff506d1af2 Revert^2 "Add TARGET_SYSTEM_PROP to system build.prop"
027f50246f

Change-Id: I3e2e8d90029f897f1dbf76a829518cb7fe4a47b1
2024-07-25 03:27:49 +00:00
Inseob Kim
155eb6e21d Merge changes from topic "revert-3184480-system_build_prop_soong-BZIDUTEOOC" into main am: 7d7baf7220
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3195633

Change-Id: I35846419402c7a0cb075278ef1f9b83bff81aa88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 02:51:18 +00:00
Inseob Kim
7d7baf7220 Merge changes from topic "revert-3184480-system_build_prop_soong-BZIDUTEOOC" into main
* changes:
  Revert "Add TARGET_SYSTEM_PROP to system build.prop"
  Revert "Sync gen_build_prop.py to sysprop.mk"
  Revert "Use Soong-built system/build.prop"
2024-07-25 02:48:23 +00:00
Inseob Kim
027f50246f Revert "Add TARGET_SYSTEM_PROP to system build.prop"
Revert submission 3184480-system_build_prop_soong

Reason for revert: breaks ndk and mainline build 

Reverted changes: /q/submissionid:3184480-system_build_prop_soong

Change-Id: Ic089dc3dfcbf2083d1bcf2413be432dcb61ce525
2024-07-25 02:45:53 +00:00
Inseob Kim
c8a68e841f Add TARGET_SYSTEM_PROP to system build.prop am: bcc00559c6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3182381

Change-Id: Ib1ba1c34304b6ae7b1a7833603162c438ec5ad4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 02:08:22 +00:00
Inseob Kim
b93b9f0b3a Merge changes from topic "system_build_prop_soong" into main
* changes:
  Use Soong-built system/build.prop
  Sync gen_build_prop.py to sysprop.mk
  Add TARGET_SYSTEM_PROP to system build.prop
2024-07-25 02:07:00 +00:00
Inseob Kim
bcc00559c6 Add TARGET_SYSTEM_PROP to system build.prop
System partition's build_prop output now contains TARGET_SYSTEM_PROP.
Soong needs to know paths to add them to ninja build dependency graph.

Bug: 322090587
Test: build and compare both build.prop files
Change-Id: Ide73e876d28eda0cced2ec08bd3c680115025ad8
2024-07-24 15:53:54 +09:00
Kiyoung Kim
8a2bef0adb Merge "Remove VSDK related code from build" into main am: e51cb36a48
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3188060

Change-Id: I676c7500fc17b602d0535c2edfb07376c4be538e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-24 03:52:43 +00:00
Kiyoung Kim
a7510851ea Remove VSDK related code from build
Remove leftover VSDK related code from build, as they are no longer in
use.

Bug: 332986564
Test: AOSP CF build succeeded
Change-Id: I7dcec66ddf6ee9a563ac09a3fa8a282c9e00258a
2024-07-23 12:18:45 +09:00
Treehugger Robot
b8dd8b1e05 Merge "Add 'use_debug_art' to product_variable" into main am: 00abdc02de
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3160220

Change-Id: Ia654e2b75c8341f1a64a0bc63c811485c169de6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-19 03:36:13 +00:00
Kiyoung Kim
881e465fda Add 'use_debug_art' to product_variable
Add 'use_debug_art' property to product_variable so it can be checked
from Android.bp whether ART debug APEX or ART APEX should be used.

Bug: 351698657
Test: AOSP CF eng build succeeded
Test: AOSP CF userdebug build succeeded
Change-Id: I01cd80f0d899c55828ecb05fdafdc9bb05fd8200
2024-07-18 13:25:18 +09:00
Taylor Santiago
3c16e61c57 Add ABFS (Android Build Filesystem) configuration option to Soong
Change-Id: Ibbe81004adc67b1212d7e619a35f7425bfee0d72
2024-07-17 14:50:25 -07:00
Treehugger Robot
c8c78e961e Merge "Define otacerts_zip module in soong" into main am: 2fb3964e21
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3160437

Change-Id: I8523694c1a3faefc4bb5b1aee5a096220a068c9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-04 23:17:22 +00:00
Justin Yun
635e788274 Define otacerts_zip module in soong
To move the otacerts module from make to soong, define a new module
type otacerts_zip module. This module collects key files from
PRODUCT_DEFAULT_DEV_CERTIFICATE and PRODUCT_EXTRA_OTA_KEYS
(PRODUCT_EXTRA_RECOVERY_KEYS for recovery) to install the zipped file
in etc.
otacerts_zip module is available to recovery to install the
otacerts.zip file in the recovery partition.

Bug: 335364209
Test: Define "PRODUCT_DEFAULT_DEV_CERTIFICATE := \
                 build/make/target/product/security/testkey" and
      m aosp_cf_system_x86_64
Change-Id: Ib5b671e9caef0403c6d9d69bfab29be248d7086c
2024-07-04 15:56:36 +09:00
Xin Li
037736c1d0 Merge "Merge 24Q3 (ab/11976889) to aosp-main-future" into aosp-main-future 2024-06-20 19:38:53 +00:00
Inseob Kim
9687618816 Merge "Add build_prop soong module" into main 2024-06-19 03:26:37 +00:00