Commit graph

76771 commits

Author SHA1 Message Date
Bill Yi
f104ed681e Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE
Merged-In: Id9f1422402e8a9cbbf4fa09dfd1b11c1fba73309
Merged-In: I13e258dfcd47e8e513239b2517c30fff1a74565a
Change-Id: I76592965b1a89f35e458f1386bf818c2ac30b954
2022-07-08 07:18:02 -07:00
Treehugger Robot
b4f831d56b Merge "Fix broken test_lunch.py" 2022-07-01 04:53:23 +00:00
Yi-yo Chiang
380fcee20e Merge "Fix init_boot.img build rule with TARGET_NO_KERNEL:=true" 2022-07-01 03:39:24 +00:00
Yi-Yo Chiang
8b0776d1ca Fix init_boot.img build rule with TARGET_NO_KERNEL:=true
If TARGET_NO_KERNEL is true (device has prebuilt boot.img), then the
init_boot.img build arguments wouldn't be propagated correctly.
This is because INTERNAL_INIT_BOOT_IMAGE_ARGS is misplaced within a
`ifneq ($(strip $(TARGET_NO_KERNEL)),true)` conditional block.

Fix this by moving INTERNAL_INIT_BOOT_IMAGE_ARGS initialization into the
`ifeq ($(BUILDING_INIT_BOOT_IMAGE),true)` block, which is closer to its
first use.

Bug: 237630862
Test: m initbootimage
Change-Id: I6c0ee2c4b5d0be77a93311eba714e0ed555ffd25
2022-06-30 17:44:33 +08:00
David Anderson
6531b32955 Merge "Make it easier to disable EROFS compression." 2022-06-28 18:28:01 +00:00
Melisa Carranza Zúñiga
051c9a15af Merge "Add sign_sepolicy_path for a binary to sign sepolicy.apex." 2022-06-28 12:26:50 +00:00
Treehugger Robot
ea00bc65af Merge "Export the host_required property to module-info" 2022-06-28 06:55:38 +00:00
Yike
e4a549195c Export the host_required property to module-info
Some test modules such as `android_test` use the `host_required` attribute to include additional harness dependencies. For example, `CtsLibcoreTestCases` references `cts-dalvik-host-test-runner` in the `host_required` attribute since those jars are required by Tradefed at runtime.

This information needs to present in module_info.json and exported to properly generate Bazel targets that include these runtime dependencies.

Test: m out/target/product/coral/module-info.json
Bug: 220991354
Change-Id: I8d2ab0da04c9f4aff17d290999c69ffe0534729f
2022-06-28 10:10:35 +08:00
David Anderson
f3c81d7e10 Make it easier to disable EROFS compression.
Currently the only way to do this is to enable deduplication.

Bug: N/A
Test: BOARD_EROFS_COMPRESSOR := none
Change-Id: I7f8b99fbcefe7bbc15dfab7062b321aa3e2cf1ca
2022-06-27 23:20:34 +00:00
Vinh Tran
836d78413a Merge "Default BuildBrokenDepfile to empty (false)" 2022-06-27 21:17:27 +00:00
Cole Faust
556a556883 Merge "Deduplicate multiple $(inherit-product) calls" 2022-06-27 17:01:04 +00:00
Vinh Tran
3fae6fe0db Default BuildBrokenDepfile to empty (false)
Test: The builds should still pass because all depfile is cleanup in
AOSP
Bug: 179452413

Change-Id: Ifb6f5320f72c3beb44ddd6654100645e0a62e659
2022-06-27 12:05:11 -04:00
Melisa Carranza Zuniga
e0a977affd Add sign_sepolicy_path for a binary to sign sepolicy.apex.
Bug: b/217570541
Test: sign_apex --container_key=testdata/testkey
--payload_key=testdata/testkey_RSA4096.key
--codename_to_api_level_map=S:31,T:32,UpsideDownCake:33
-e SEPolicy-33.zip=testdata/testkey com.android.sepolicy.apex
signed_sepolicy.apex

Change-Id: Ifdd1c6e7db07cbc4674450ab0e2226494c98605a
2022-06-27 11:03:26 +02:00
Kelvin Zhang
91410f104d Merge "Fix potential issues if str has spaces" 2022-06-25 00:49:48 +00:00
Treehugger Robot
d0bf76d32a Merge "Copy symlink farm creation tool from Bazel." 2022-06-24 23:27:45 +00:00
Cole Faust
7162b95f83 Deduplicate multiple $(inherit-product) calls
The makefile product inheritance code was supposed
to deduplicate inheritance calls, but there was
a bug in the uniq-word function that caused it
to not work when duplicated words were adjacent.
$(subst |||x|||,||| |||,|||x|||x|||) produces
||| |||x||| instead of ||| ||| |||.

Rewrite the uniq-word function to fix the bug.

This issue was causing a discrepency between
the makefile and starlark based product configurations,
as the starlark implementation didn't have this bug.

Bug: 237019892
Test: ./build/bazel/ci/rbc_dashboard.py --quick on an internal-only product
Change-Id: I543a80746412ffcb9743203399413a0e707111e6
2022-06-24 15:42:46 -07:00
Sasha Smundak
2bfc570d8f Copy symlink farm creation tool from Bazel.
SymlinkTree is one of the action types Blaze returns in response to
`aquery` (action query). build-runfiles is a tool copied from Bazel
to implement this action (see src/main/tools/build-runfiles.cc in
the Bazel Git repo). It creates a symlink farm (i.e., a directory
hiearchy consisting of symlinks) from a given manifest. Mixed builds
need this tool the mixed builds (in particular, every Python applicaion
has a runtime symlink farm).

Bug: 232085015
Test: m USE_BAZEL_ANALYSIS=1 com.android.adbd
Change-Id: I9cfcb33cb7d0f63bd36ffd2b4101f53cfc6a42fc
2022-06-24 09:57:45 -07:00
jiajia tang
e5ddfcd004 Fix potential issues if str has spaces
Uniform the split() function
str.split() will return a list split all spaces in str,
while str.split(' ') will return a list might contain ''
which might have potential issues.

Signed-off-by: jiajia tang <tangjiajia@xiaomi.com>
Change-Id: I0961659b140f800bdbe285f63bb4f02b8459ff8b
Signed-off-by: jiajia tang <tangjiajia@xiaomi.com>
2022-06-23 23:56:45 +00:00
Treehugger Robot
dc08c346fb Merge "Do not override setting of SOONG_CONFIG_<m>_module_source_build" 2022-06-23 22:21:41 +00:00
Paul Duffin
1ccea0574f Do not override setting of SOONG_CONFIG_<m>_module_source_build
(cherry picked from commit dccd189954)

Previously, any setting of SOONG_CONFIG_<m>_module_source_build (where
<m> is one of wifi, uwb or bluetooth) that was made before the
core/android_soong_config_vars.mk was processed would be replaced with
false. This change will only set them to false if they have not been
previously set.

Bug: 233965247
Test: m nothing
      # After setting SOONG_CONFIG_wifi_module_source=true before this
      # code. Without this change out/soong/soong.variables uses false
      # for the wifi_module/module_source config variable. With this
      # change it uses true.
Merged-In: I1dffeb055a68250f574630d4ef5fedc51bad4a2b
Change-Id: I1dffeb055a68250f574630d4ef5fedc51bad4a2b
2022-06-23 18:09:38 +00:00
Almaz Mingaleev
f68794510f Merge "Remove tzdatacheck from system image." 2022-06-23 07:47:26 +00:00
Jared Duke
88aaae3547 Merge "Enable R8 code shrinking for system_server by default" 2022-06-22 20:55:58 +00:00
Christopher Ferris
4876480992 Merge "Remove libbacktrace." 2022-06-22 17:07:33 +00:00
Bob Badour
e900707ee0 Merge "Revert "Target dist files not dist goals."" 2022-06-21 22:31:48 +00:00
Bob Badour
9f1fad04ce Revert "Target dist files not dist goals."
This reverts commit 0b907f3944.

Reason for revert: Possible cause of b/236556224

Bug: 236556224

Change-Id: I2faefbdf58202d0033bee15a2eda7a75e44a1bec
2022-06-21 22:27:59 +00:00
Chris Wailes
881e3a493f Merge "Add USAP related system properties" 2022-06-21 22:19:49 +00:00
Jared Duke
b11b1d2437 Enable R8 code shrinking for system_server by default
Flip the setting that controls R8 shrinking for system_server from
opt-in to opt-out. This can be controlled by vendor makefiles and from
the command-line using the `SYSTEM_OPTIMIZE_JAVA` boolean build flag.

Note that this change only enables code shrinking for system_server,
and should not impact stack traces except for certain stack frames
involving synthetics.

Additional (vendor) code that is loaded dynamically into
system_server, that references system_server code, should use
system_server APIs that are expicitly annotated with
`@android.annotation.SystemApi`.

Additional (vendor) code added directly to services.jar,
which doesn't fall into existing keep patterns in the services
proguard.flags configuration and would otherwise be stripped, should be
annotated with `@com.android.internal.annotations.Keep`.

Results: services.jar (20MB -> 17MB)

Bug: 210510433
Test: atest
  CtsInstalledLoadingProgressHostTests
  CtsAutoFillServiceTestCases
  CtsAppSecurityHostTestCases
  CtsAppTestCases
Change-Id: Icc77c9451d9a4a83e02cb591693354988f8d0ec4
2022-06-21 20:34:51 +00:00
Treehugger Robot
1b89a42778 Merge "Delete OneTimeInitializer AOSP app from the makefile." 2022-06-21 17:25:23 +00:00
Jiyong Park
8be3eced81 Merge "Export PLATFORM_VERSION_KNOWN_CODENAMES to soong" 2022-06-21 16:54:26 +00:00
Anton Hansson
0f079826a1 Merge "Fix typo" 2022-06-21 13:14:33 +00:00
Jiyong Park
2e057215b9 Export PLATFORM_VERSION_KNOWN_CODENAMES to soong
Bug: 236602028
Test: watch TH
Change-Id: Ieb156dfb363e58ef4949cf5a340b3011f310097f
2022-06-21 10:12:24 +09:00
jiajia tang
7c8dd8c3d4 Fix typo
As title

Signed-off-by: jiajia tang <tangjiajia@xiaomi.com>
Change-Id: I40b155ceed8e88fecf25da5dd13a2fb146faf263
2022-06-21 00:21:45 +00:00
Treehugger Robot
7669d15025 Merge "Merge SQ3A.220605.009" 2022-06-20 13:36:04 +00:00
Jooyung Han
3416b972d0 Merge "Remove AIDL libs from VNDK libs" 2022-06-20 01:15:09 +00:00
Treehugger Robot
2c2f75b2c1 Merge "Target dist files not dist goals." 2022-06-18 00:59:56 +00:00
Raman Tenneti
97c0af9500 Delete OneTimeInitializer AOSP app from the makefile.
Bug: 227214526
Test: presubmit
Change-Id: Id01f3f27a4d97497f1977b2327ff0d8fc52bc359
2022-06-17 15:20:33 -07:00
Christopher Ferris
d496e2a966 Remove libbacktrace.
Bug: 120606663

Test: Builds.
Change-Id: I0ee340f14f05d936272339cf47140202f019ccfb
2022-06-17 14:28:47 -07:00
Bob Badour
d9e88135ec Merge "Revert "Revert "Record license text for every dist target.""" 2022-06-17 20:24:21 +00:00
Treehugger Robot
caf26acb1f Merge "ignore .iml files (IntelliJ)" 2022-06-17 20:18:25 +00:00
Bob Badour
0b907f3944 Target dist files not dist goals.
It turns out dist goals do not map well to units of code distributed.
They often build a combination of files to distribute and files for
internal use only.

This change creates license texts and lists of projects to share for
individual files in dist instead of for dist goals.

If a distribution needs the license texts for part of a dist file or
for a combination of multiple files, whoever is distributing will have
to create a suitable text notice using `gen_notice{}` or `testnotice`
and include it among the dist files for the goal using `dist-for-goals`
or equivalent.

Bug: 151177513
Bug: 210912771
Bug: 235333302
Bug: 232138105
Bug: 235302632

Test: m cts dist

Test: m droid dist

Test: tapas google-tradefed-all && m dist

Change-Id: Id78f032575a2ac1a3cc70643b3ae4d2e6c32da04
2022-06-17 13:11:22 -07:00
Anton Hansson
670fed3df4 Merge "Don't exclude docs build from using prebuilts" 2022-06-17 16:56:32 +00:00
Usta Shrestha
4d69479b88 ignore .iml files (IntelliJ)
Test: N/A
Bug: N/A
Change-Id: I8917fd887b86a39c056d7bf04fd647fc8172c398
2022-06-17 12:17:53 -04:00
Xin Li
26a43c5e24 Merge SQ3A.220605.009
Bug: 236045730
Merged-In: Iac5d1f2b0c48bf5ff7dc89d00d49944e764cec5c
Change-Id: Ibb3c3083d8d57179f37dd12547b036fa2af6c46d
2022-06-16 22:36:08 -07:00
Treehugger Robot
a2ed2629c6 Merge "Inline some variables that are only used in 1 place" 2022-06-17 04:54:43 +00:00
Chris Wailes
197429ccb0 Add USAP related system properties
Test: Build; flash; set property; check device state
Bug: 161725679
Change-Id: I68fd45de51e20ad696e4a0e3201fb89031e97e5e
2022-06-16 23:39:23 +00:00
Xin Li
91c2117fdb Merge "Merge Android 12 QPR 3" 2022-06-16 18:51:57 +00:00
Cole Faust
8fc7befdbb Inline some variables that are only used in 1 place
Test: Presubmits
Change-Id: Ic72fdb6c401f345ecfcaacb0179a9a3cd6a13e9d
2022-06-15 16:10:49 -07:00
Bob Badour
dce80abbe3 Revert "Revert "Record license text for every dist target.""
This reverts commit 1e27f4fff9.

Reason for revert: Rolling forward again without 'all' target.

Bug: 151177513
Bug: 210912771
Bug: 235333302
Bug: 232138105

Test: m droid dist reportmissinglicenses

Test: tapas google-tradefed-all && m dist

Change-Id: I392047ec50ac6e74b9accf260c62e77aef1640d5
2022-06-15 13:06:18 -07:00
Dan Willemsen
59f36c1950 Merge "Fix potential error for sys.platform" 2022-06-15 20:02:04 +00:00
Anton Hansson
c9a5d76f32 Don't exclude docs build from using prebuilts
Even though it doesn't have google modules in PRODUCT_PACKAGES,
the docs build wants to use prebuilts when the rest of the branch
does.

Bug: 230478310
Test: m docs (inspect MODULE_BUILD_FROM_SOURCE)
Merged-In: I1d67f4099e9fdc5fbaeeb0bf0fce80aa91c05eb5
Change-Id: I1d67f4099e9fdc5fbaeeb0bf0fce80aa91c05eb5
2022-06-15 17:59:49 +00:00