Commit Graph

58107 Commits

Author SHA1 Message Date
Martijn Coenen ecd9fde76f Merge changes from topic "emulated_storage_props"
* changes:
  Rename ro.emulated_storage properties.
  Move ro.emulated_storage properties to PRODUCT_PROPERTY_OVERRIDES.
2020-04-16 08:06:52 +00:00
Martijn Coenen c5ce32b19a Rename ro.emulated_storage properties.
Whether these are enabled or not is independent of whether storage is
emulated or not; instead, use 'external_storage', and add the enabled
suffix as per property naming guidelines.

Bug: 152170470
Bug: 153525566
Test: N/A
Change-Id: Id893ce19025ded1ee1521081f7fc722dfee8e662
2020-04-15 17:28:23 +02:00
Martijn Coenen 178040341b Move ro.emulated_storage properties to PRODUCT_PROPERTY_OVERRIDES.
These need to be a part of the vendor partition and be set even when
using GSI.

Bug: 152170470
Bug: 153525566
Test: android.drm.cts.DRMTest#testForwardLockAccess
Change-Id: I1e69d5c203d4f7480a6651ca780fbd307ce71c23
2020-04-15 14:21:34 +02:00
Treehugger Robot 62d5978710 Merge "strings.mk: Allow empty RHS values for inputs of collapse-pairs" 2020-04-15 04:08:12 +00:00
Dan Shi 3c4326f32f Merge "Include shared host liraries in test suite zip" 2020-04-14 23:10:51 +00:00
Treehugger Robot 44bb05c328 Merge "Enable non-v3 recovery image with v3 boot image" 2020-04-14 22:37:28 +00:00
Steve Muckle f84668e1da Enable non-v3 recovery image with v3 boot image
Add support for building a non-v3 recovery image along with a
v3 boot.img and vendor_boot image.

Bug: 150825361
Change-Id: I80d4e71ff09b83dd1c7f9accb4de99a30f95f4bf
2020-04-14 13:03:58 -07:00
Jooyung Han 10644f1485 Merge "Remove PLATFORM_VERSION_FUTURE_CODENAMES" 2020-04-14 04:00:03 +00:00
Jooyung Han 7fcd3b36ee Remove PLATFORM_VERSION_FUTURE_CODENAMES
It has been wrong to split ALL_VERSIONS into exclusive two sets of
before/after TARGET_PLATFORM_VERSION.

And PLATFORM_VERSION_ALL_CODENAMES supports all *active* list of
non-finalized codenames.

Bug: 152960049
Test: m
Merged-In: I1e87206a7f261e587cf079cb6b7025ca16aa4fe4
Change-Id: I1e87206a7f261e587cf079cb6b7025ca16aa4fe4
(cherry picked from commit abe575d17b)

Exempt-From-Owner-Approval: cp from master
Change-Id: I1e87206a7f261e587cf079cb6b7025ca16aa4fe4
2020-04-14 02:06:19 +00:00
Treehugger Robot 8266acdb9d Merge "Don't install test suite files from uninstallable modules" 2020-04-14 00:26:00 +00:00
Treehugger Robot f50a23e684 Merge "Update refreshmod docs." 2020-04-13 19:58:16 +00:00
Colin Cross fca369e4e3 Don't install test suite files from uninstallable modules
Don't copy tests or test data to the test suite directories if the
module is marked LOCAL_UNINSTALLABLE_MODULE := true.

Fixes: 153758132
Test: m checkbuild
Change-Id: Ibdf18807a2ffe9bb352d74880a802ad55b57f154
2020-04-13 12:21:44 -07:00
Dan Shi 6a619b8d85 Include shared host liraries in test suite zip
Bug: 151194160
Test: m -j vts && \
  ls out/host/linux-x86/vts/android-vts/testcases/lib64/
Change-Id: I7ebc4bf392d4c0f27478607846974631390097f8
2020-04-13 09:29:16 -07:00
Treehugger Robot 083b9e9daa Merge "libselinux is LLNDK, not VNDK-core" 2020-04-13 04:05:31 +00:00
Steven Moreland ab25c7a30f Update refreshmod docs.
This also affects pathmod here.

Since it's updating module-info.json, we could say that as well (this
should affect any tools which parse this file), but I haven't seen any
indication it's necessary in this context.

Bug: N/A
Test: N/A
Change-Id: Iecb6f454112b5c0095ee7063bc5442fdb1e3bd09
2020-04-09 12:05:34 -07:00
Paul Duffin 388f1a4596 Merge "Add phony module for droidstubs even if srcjar is not created" 2020-04-09 15:42:07 +00:00
Colin Cross 65ca0eec96 Merge "Revert "Revert "Use sdk variant of Soong modules when LOCAL_SDK_..."" 2020-04-08 18:29:30 +00:00
Paul Duffin e9e7247749 Add phony module for droidstubs even if srcjar is not created
This makes it possible to build the .txt file by using the module name
rather than using its path.

Bug: 146727827
Test: m framework-sdkextensions-api-module_libs_api
Change-Id: I8ccbdfeedc0f418d95a79b01e4724837d9dcd6ca
2020-04-08 18:49:22 +01:00
Roland Levillain 4f5f316a5b Merge "Print a user-friendly message when `lunch` cannot use the default product." 2020-04-08 15:41:11 +00:00
Roland Levillain 23c46cf424 Print a user-friendly message when `lunch` cannot use the default product.
In some environments (e.g. with the master-art branch), the default
product (aosp_arm-eng) cannot be built, and thus prevents `lunch` from
printing the lunch menu (as it cannot initialize the build system in
order to fetch the common lunch choices). When this happens, show an
explicit error message from `lunch` instead of a Soong UI error.

Test: Check that this command line displays the expected error message:
        unset TARGET_PRODUCT && . build/envsetup.sh && lunch
Bug: 152762648
Change-Id: I40c66bca5b075d88dbc8364b36b2db713e6ad93e
2020-04-08 13:09:49 +01:00
Xin Li d95545fc81 Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" 2020-04-08 06:26:03 +00:00
Xin Li 4e8f40a307 DO NOT MERGE - Merge QQ2A.200405.005 into master
Bug: 150877681
Change-Id: I5e36c453de41b16cf722454edb21428cfd3b759c
Merged-In: Ic383f938d12f9fac0d93364ba737f0c401fb0a01
Merged-In: I4e5b07e96a1ddc23057b373a1ff7d9f54ae361bb
2020-04-08 03:39:21 +00:00
Jaewoong Jung e57fb1a3aa Merge "Add signing certificate lineage file support." 2020-04-07 22:33:25 +00:00
Colin Cross e0c5e44360 Revert "Revert "Use sdk variant of Soong modules when LOCAL_SDK_..."
Revert^2 "Add sdk mutator for native modules"

f8e80229fedb47302e9cfd32990859a6308020cf

Change-Id: Ib686b52339ae5031434a2fb6a0e7f5b0c0dc5641
2020-04-07 16:50:32 +00:00
Vladimir Marko 385c9ae90f Merge "Pass /system/etc/updatable-bcp-packages.txt to dex2oat." 2020-04-07 07:34:14 +00:00
Treehugger Robot ddeddc819d Merge "Fix signing on some GSI targets" 2020-04-07 04:33:19 +00:00
Colin Cross 189a925c8b Merge "Revert "Use sdk variant of Soong modules when LOCAL_SDK_VERSION ..."" 2020-04-07 04:25:34 +00:00
Colin Cross 79e5a55122 Revert "Use sdk variant of Soong modules when LOCAL_SDK_VERSION ..."
Revert "Add sdk mutator for native modules"

Revert submission 1242911-sdk_version_variant

Reason for revert: b/153394225
Reverted Changes:
Ife99745fb:Use libnativewindow for platform variant of libagq...
I1bae84c43:Use libnativewindow for platform variant of androi...
I6e6021ed3:Use stl to depend on libc++
Ife99745fb:Use libnativewindow for platform variant of libRSS...
I2c9f439b9:Fix static dependency on libprotobuf-cpp-lite-ndk
Iff2aff9cf:Set sdk_version for cc_genrules used by modules wi...
I7d72934aa:Add sdk mutator for native modules
Ief378a007:Use sdk variant of Soong modules when LOCAL_SDK_VE...

Bug: 149591340
Change-Id: I6cd4de221ece29e48d58a8b1297dc2512b2dad13
Fixes: 153394225
2020-04-07 04:21:21 +00:00
Colin Cross a2af96b642 Merge "Use sdk variant of Soong modules when LOCAL_SDK_VERSION is set" 2020-04-07 01:52:10 +00:00
Jaewoong Jung 95445e6913 Add signing certificate lineage file support.
Also add multi-cert support to prebuilt apps so that they can benefit
from the new lineage feature.

(This is a cherry-pick change.)

Test: m GoogleServicesFramework w/ modified build rules
Test: m PrebuiltGmsCore w/ modified build rules
Test: apksigner lineage -v --print-certs -in <built_module_path>
Fixes: 152897457
Change-Id: If7d5d4bd308629c8340231520214c76c8a568a65
Merged-In: If7d5d4bd308629c8340231520214c76c8a568a65
2020-04-06 13:42:23 -07:00
Zhen Zhang 760e3768bb Merge "emulator: fix full-eng build on aosp" 2020-04-06 20:06:15 +00:00
bohu 0f9c766320 emulator: fix full-eng build on aosp
BUG: 153361966
Test: Build full-eng
Change-Id: I0e8f065cf875d19be705430c642922f2c9a39d76
2020-04-06 20:01:24 +00:00
Bo Hu ac74429171 Merge "emulator: enable vendor boot image" 2020-04-06 19:18:13 +00:00
Bill Peckham f6baf822ac Merge "Ensure that merge_target_files.py prints INFO level logs." 2020-04-06 19:00:56 +00:00
bohu 8fd437c80a emulator: enable vendor boot image
BUG: 149826779
Test: Build x86, x86_64, armv7 and arm64
make sure x86/64 boot to home screen;
armv7/arm64 can pass disk mounting stage

Change-Id: I258b69bd0cdc4fb0a99b1a04567051e8d32c389a
2020-04-06 14:05:28 +00:00
Vladimir Marko 09e885dc6d Pass /system/etc/updatable-bcp-packages.txt to dex2oat.
Test: aosp_taimen-userdebug boots.
Test: Check logcat for the new argument in the dex2oat
      invocations that happen on first boot.
Bug: 151314205
Change-Id: Id2a14c3810897ead213238b63aee5ff180b56397
2020-04-06 12:15:57 +01:00
Tianjie Xu 0889aaeeae Merge "Change the parameter type of offset in read" 2020-04-04 20:00:20 +00:00
Bill Peckham cb84817fdf Ensure that merge_target_files.py prints INFO level logs.
Bug: 153166596
Test: Run a merge build, inspect logs.
Change-Id: Ic2795f26922db32030c7ab7eb4ec6f153c1e9654
2020-04-04 04:20:45 +00:00
Bill Peckham 0447be9904 Merge "Make the `partition=` tag optional." 2020-04-04 04:12:35 +00:00
Bill Peckham 5c7b034a5c Make the `partition=` tag optional.
Since we might use ToT release tools to sign a package
generated by an older build, we make the new
`partition=` tag optional. This also means we need to be
careful to use non-greedy regex matching.

Bug: 153133823
Test: python3 -m unittest
Test: input with and without the new `partition=` tag
Test: new test_ReadApkCerts_WithWithoutOptionalFields
Change-Id: Ic57efd34e745ad302ae17150c6f2318f0b4524cb
2020-04-03 17:09:37 -07:00
Dan Shi 488d665d7d Merge "Rename vts-core to vts" 2020-04-03 22:47:23 +00:00
Dan Shi 48382eaa74 Merge "Cleanup VTS-Core and VTS10 related artifacts" 2020-04-03 21:32:12 +00:00
Dan Shi 4fd493dae1 Cleanup VTS-Core and VTS10 related artifacts
Bug: 151896491
Test: none
Change-Id: I5a42dcbe34866751a54f059d363f1866bff7d47a
Merged-In: I5a42dcbe34866751a54f059d363f1866bff7d47a
2020-04-03 10:16:21 -07:00
Treehugger Robot 40ddffe600 Merge "fix boot-test-harness.img build" 2020-04-03 15:33:31 +00:00
Tom Cherry 8c7a4f6fc1 Merge "Include private/fs_config.h directly when needed" 2020-04-03 14:36:58 +00:00
Kousik Kumar 1493444674 Merge "Update configuration for RemoteExecution actions" 2020-04-03 13:48:40 +00:00
Anton Hansson a0ef52302e Merge "Reland: Remove empty newline in build.prop" 2020-04-03 11:58:17 +00:00
Steve Muckle 4866bd6bff fix boot-test-harness.img build
The recently added support for multiple kernels and boot.img files
missed the boot-test-harness.img.

Bug: 152464066
Change-Id: I6e146a0702bc933e0b62f36dc34aba913e57316f
2020-04-02 12:37:04 -07:00
Kousik Kumar 3fd528e215 Update configuration for RemoteExecution actions
1. Specify addition inputs needed for R8 / D8 / Javac actions so that
they can be successfully executed remotely.
2. Cleanup platform configuration so that pool-names are turned into a
common variable and re-used between javac / r8 / d8 actions.

Bug: b/152273259
Change-Id: I0231a96f6e4e094e98d0f89728f6ac3e34f78118
Merged-In: I0231a96f6e4e094e98d0f89728f6ac3e34f78118
2020-04-02 12:07:47 -07:00
Tianjie Xu 2995096483 Merge "Add aftltool is a signing parameter" 2020-04-02 18:09:59 +00:00