Commit Graph

4449 Commits

Author SHA1 Message Date
Jooyung Han 9340a673cd make: Add support to skip current VNDK install
You can get a system.img without current VNDK libs.
This may help when you want a smaller system.img given that the image
will be used with a specific version (not current) of vendor image.

Bug: 132140714
Test: m TARGET_SKIP_CURRENT_VNDK=true && see if current VNDK is not
installed

Change-Id: Ie0815e6dd6ce2f861b6c42e637da4bb146320673
2019-05-25 02:06:08 +09:00
SzuWei Lin 5f23fee45f Add AOSP WallpaperPicker to GSI
The patch also update the mainline whitelist.

Bug: 133295307
Test: build gsi_arm64-userdebug and flash on a Pixel device,
Test: long press on the homescreen, WallpaperPicker is in the selection
Change-Id: I7831471cc920a24d64512341f0e4f3fef5024b30
2019-05-22 17:29:58 +08:00
Andrew Lehmer 4c42d17465 Revert "Remove USE_XML_AUDIO_POLICY_CONF build flag"
This reverts commit 79c61ba50e.

Reason for revert: Buildcop

Change-Id: I18d3ebeded2e9b20fef3a57c8509a2e701f6692e
2019-05-14 21:16:46 +00:00
Mikhail Naganov 79c61ba50e Remove USE_XML_AUDIO_POLICY_CONF build flag
This flag is no more used by the build files and should
be removed.

Bug: 132435217
Test: make
Change-Id: Icbd2359da659290ce4fba1a11ba6da76f23679da
2019-05-13 14:02:43 -07:00
Treehugger Robot eba4d2312a Merge "Remove libc_malloc_{debug,hooks} from the system image." 2019-05-09 19:13:43 +00:00
Jiyong Park 02426e6118 Ensure TARGET_FLATTEN_APEX == true when ro.apex.updatable is not set
TARGET_FLATTEN_APEX and ro.apex.updatable cannot be independently set.
For a device where updating APEXes is not supported, ro.apex.updatable
should not be set (or set to false) and TARGET_FLATTEN_APEX should be
set to true. For APEX-supporting devices, it is the opposite;
ro.apex.updatable == true and TARGET_FLATTEN_APEX is false (or not set).

To ensure this relationship, TARGET_FLATTEN_APEX is by default set to
true, and overridden to false when updatable_apex.mk is inherited.

Bug: 130623080
Test: choosecombo to Pixels 2 and later; get_build_var
TARGET_FLATTEN_APEX returns false.
choosecombo to the original Pixel and other non-Pixel targets;
get_build_var TARGET_FLATTEN_APEX returns true.
choosecombo to the cuttlefish; get_build_var TARGET_FLATTEN_APEX
returns false

Merged-In: Id73a594dd9838457e68e2793122592c11a84fc83
Change-Id: Id73a594dd9838457e68e2793122592c11a84fc83
(cherry picked from commit 18411a42f0)
2019-05-09 09:56:55 +09:00
Tao Bao 246a30a1cb Merge "Unset AB_OTA_UPDATER from BoardConfigMainlineCommon." 2019-05-08 18:37:28 +00:00
Tao Bao ff2a3f0af8 Unset AB_OTA_UPDATER from BoardConfigMainlineCommon.
The previous need to build mainline devices as A/B no longer applies
[1], as we have unbundled the install of update-payload-key.pub.pem from
AB_OTA_UPDATER. Unsetting AB_OTA_UPDATER from BoardConfigMainlineCommon
defers the decision of using A/B OTA to be board-specific.

mainline_arm64 is considered as a specific board to build generic
system-only OTAs in A/B format. So it defines the two variables there.

[1] commit 571fab0610

Bug: 130516531
Test: TreeHugger
Test: Compare the built images for GSI and mainline targets. They don't
      have different artifacts due to the change.
Change-Id: I33cc9b6623dca7cc7c2a7e2c65cdbccced5e816e
2019-05-07 13:26:09 -07:00
Martin Stjernholm 5055dae50c Remove libc_malloc_{debug,hooks} from the system image.
They are part of Bionic and should now be in the Runtime APEX.

Test: Flash and boot
Bug: 122566199
Bug: 118374951
Change-Id: Ib1a2999b56d743242ef7aafa7aed57f8c6a7b0e5
2019-05-07 17:33:36 +01:00
Treehugger Robot 5e25df9f5a Merge "Don't inherit updatable_apex from mainline_system" 2019-05-06 17:16:12 +00:00
bohu 9492ee3d1b emulator: support dynamic partitions
BUG: 125540538

Change-Id: I9d486f57ac4ec11b1bbe9ab97890d12441c3054e
Merged-In: I9d486f57ac4ec11b1bbe9ab97890d12441c3054e
2019-05-05 20:34:02 -07:00
Jiyong Park 9af722d59e Don't inherit updatable_apex from mainline_system
Camera on aosp_* targets are broken because they are inheriting from
updatable_apex.mk through mainline_system.mk. However, the kernels for
the targets on AOSP are too old to support updatable APEX. Temporarily
disabling updatable apex until when the kernels are updated from
internal master.

Bug: 131162245
Test: camera can be captured in aosp_crosshatch
Merged-In: Ibfef74db0769992266ebadf445836d2a183df3f7
Change-Id: Ia0beeb9523ade9bb8180034deb8ef0b01ee1c88b
2019-05-03 18:23:21 +00:00
Sasha Smundak f222dfbb0c Provide android_app_certificate module that always points to AOSP
certificate.

See the comment in cts/tests/tests/carrierapi/Android.bp

Bug: 122332514
Test: atest CtsCarrierApiTestCases
(same failures as baseline)
Change-Id: I80b9a1e466a3556486d05befe60d3522e6980ef5
2019-05-02 22:22:47 -07:00
Calin Juravle c23e013814 Merge "Rename PRODUCT_USES_ART to PRODUCT_USES_DEFAULT_ART_CONFIG" 2019-05-02 17:56:11 +00:00
Lajos Molnar bf77eecd3d allow actually 140MB vendor partition space
Bug: 129710438
Change-Id: I93bfe7f25f16a8e48871db7357ec587c21dcc7d6
Merged-In: I93bfe7f25f16a8e48871db7357ec587c21dcc7d6
2019-05-02 15:18:33 +00:00
Calin Juravle cdff6b1451 Rename PRODUCT_USES_ART to PRODUCT_USES_DEFAULT_ART_CONFIG
It better describes what is meant to represent.

Test: m build
Change-Id: I942721cee2c7eaef625bf8c64aae32c1725705eb
2019-05-01 15:35:03 -07:00
Treehugger Robot ab0ed975f0 Merge "Removing --flag 2 when building GSI vbmeta.img" 2019-04-30 08:06:34 +00:00
Yifan Hong 51e87262c2 Add product manifest.
- Rename framework_manifest.xml to system_manifest.xml since that's more accurate.
- Add product_manifest.xml to base_product.mk
- Add product_manifest.xml to verified_assembled_framework_manifest.xml to check
  it at build time.

Bug: 126770403
Bug: 130714844
Bug: 80547152

Test: build and inspect output
Test: lshal

Change-Id: I1b447d8c36f72768e28e9bcaa4d06afdeba08c2a
2019-04-25 10:22:36 -07:00
Bowgo Tsai 2e2a7682ba Removing --flag 2 when building GSI vbmeta.img
With the support of enabling AVB on standalone partitions in libfs_avb,
devices can boot GSI with dm-verity. No need to disable AVB anymore.

Devices still can use the following command to disable AVB on
device-specific vbmeta.img if needed:

    `fastboot flash --disable-verification vbmeta vbmeta.img`

Bug: 130595457
Test: Tree Hugger
Change-Id: I067dcda15f14f04428e0b60ce1f49227d61e4349
2019-04-23 18:10:01 +08:00
Treehugger Robot db57997c72 Merge "Revert "Adding adb_debug.prop"" 2019-04-23 07:40:53 +00:00
Tao Bao 22c434e80f Merge "Move update-payload-key.pub.pem into a module." 2019-04-22 17:16:46 +00:00
Treehugger Robot 6a3d438aa0 Merge "Disable non-AOSP nnapi extensions on product partition in GSI" 2019-04-22 11:46:13 +00:00
Bowgo Tsai 8966070431 Revert "Adding adb_debug.prop"
This reverts commit a280a66b5a.

/init now switched to read adb_debug.prop from debug ramdisk instead
of GSI or other system.img. No need to keep the file in GSI.

See the following for more details:
  https://android-review.googlesource.com/c/platform/system/core/+/946517

Bug: 126493225
Test: tree hugger
Change-Id: I981db8e13216fbe0f066f4d3684ee149b1177d22
2019-04-22 18:39:44 +08:00
SzuWei Lin 3c6fde2d90 Disable non-AOSP nnapi extensions on product partition in GSI
The extensions is for OEM. To avoid AOSP code using OEM
extensions mistakenly. GSI denys product to use the extensions
by enabling the following property:

    ro.nnapi.extensions.deny_on_product=true


Bug: 129900377
Test: make gsi_arm64-userdebug, check /system/build.prop
Change-Id: Ia679f1f9c108bd5a164c8cdeb1d73f57da755608
2019-04-22 06:28:13 +00:00
Tao Bao 0733fbeaf8 Move update-payload-key.pub.pem into a module.
This allows update_engine listing the file as a required module,
regardless of the value in AB_OTA_UPDATER.

Bug: 130516531
Test: Build aosp_arm64-userdebug w/o setting AB_OTA_UPDATER. Check that
      /system/etc/update_engine/update-payload-key.pub.pem is available.
Change-Id: Ied041aca750e7260402ae8dbf65ff740d0b87205
2019-04-21 18:25:24 -07:00
Tao Bao 6f34013ba6 Build otacerts as a module.
Bug: 30414428
Test: `m -j dist` with aosp_taimen-userdebug. Check
      /system/etc/security/otacerts.zip available under system and
      recovery images.
Change-Id: I5abeb2da441fb3e3231e094063c2383eb3807852
Merged-In: I5abeb2da441fb3e3231e094063c2383eb3807852
2019-04-21 14:24:43 -07:00
Lev Rumyantsev 7e9f49c73c Move default native.bridge property to system set
So that it can be overridden by PRODUCT_PROPERTY_OVERRIDES.

Test: native bridge property is overridden when requested
Bug: 130825973
Bug: 130564502
Change-Id: I8413b9b5b2ac24ac62b6cf22a5f14393420927f5
2019-04-20 23:02:16 -07:00
Calin Juravle 442942c4de Merge changes I25b0c03e,I8a8a93ca
* changes:
  Add the entire boot image to boot.zip
  Disable iorapd by default
2019-04-19 01:57:09 +00:00
Calin Juravle 6bfdcda0e6 Add the entire boot image to boot.zip
Add all the boot image files necessary of offline inspection and
compilation in a single zip file (boot.zip).

This replaces the previous boot_profiles_jars.zip which contained only the
jar files.

Bug: 130376456
Test: m dist

Change-Id: I25b0c03ee9e7a2c2ff25db406656ce79baff5a46
Merged-In: Ib71c4fcc0d451570d0bb0584745487c54f884fd9
(cherry picked from commit 3dfae3f149)
2019-04-18 17:48:39 -07:00
Mathieu Chartier ef66a8b7da Disable iorapd by default
Test: reboot and verify iorapd is not running
Bug: 123595428
Bug: 72170747

(cherry picked from commit 3dbd7356de)

Merged-In: I9c53714d6a35f8cb016e0baceeb12482d50557a5
Change-Id: I8a8a93ca088c577e0e7ac9600313c433c573f759
2019-04-18 17:48:30 -07:00
Jiyong Park 5645a3a9a0 Add updatable_apex.mk
The product abstracts configs that need to be set to support updating of
APEXes.

Bug: 130418467
Test: m
Test: adb shell getprop ro.apex.updatable in Pixel 2 and 3
Test: adb shell /system/apex/com.android.apex.cts.shim.apex exists.
Merged-In: Idb44388a0cf6338f8b4500a1d0d2762ed59476bf
Change-Id: Idb44388a0cf6338f8b4500a1d0d2762ed59476bf
(cherry picked from commit fa51bedf8b)
2019-04-17 16:18:56 +09:00
Isaac Chen d18be7f8db Merge "Change emulator system image to unsparse format" 2019-04-15 11:57:49 +00:00
Treehugger Robot 7ef6d0d39e Merge "Build: Include lock-inversion agent in debug builds" 2019-04-13 16:08:58 +00:00
vichang b23062899c Merge "Remove libicu*.so from /system" 2019-04-13 09:34:17 +00:00
Andreas Gampe 306dbcc49b Build: Include lock-inversion agent in debug builds
Bug: 124744938
Test: m
Change-Id: Ieeaab84d2bc3db73dd8a6b19c05e4f39d90f22e0
2019-04-12 15:33:01 -07:00
Victor Chang c164b8ef13 Remove libicu*.so from /system
Bug: 120659668
Test: CtsJniTestCases
Change-Id: I1c2ab41aa0b19f71025e2dd09be9b9bd306e8616
2019-04-12 20:01:43 +01:00
Anton Hansson 826d0d1f9e Merge "Add libdrm to mainline_system" 2019-04-12 15:16:28 +00:00
Anton Hansson 6f964f579d Add libdrm to mainline_system
Used by things on /product.

Bug: 130023865
Test: make
Change-Id: I564c6d823ac7e04d6a41dfd1ceb7074755b0bfd8
Merged-In: I564c6d823ac7e04d6a41dfd1ceb7074755b0bfd8
2019-04-12 11:55:20 +01:00
Isaac Chen 90bfda1cc4 Change emulator system image to unsparse format
Currently, emulator system image is the non-legasy GSI, which is in sparse
format. Several internal clients don't support sparse format, and other
internal/external clients usually support both. The reason to choose sparse
format for GSI may not be valid any more. See bug for detail.

Bug: 130341962
Test: Checked the header of system.img to see if it's unsparse.
      Boot emulator aosp_x86 successfully.
      Boot mixed GSI and CF x86 successfully.

Change-Id: I839f49809429227607b2e876a4a3628df43a97b4
2019-04-12 13:16:34 +08:00
Dan Willemsen 0ab1be6fe2 Stop using build/target -> build/make/target symlink
Instead, fully specify build/make/target/... everywhere

Test: treehugger
Change-Id: Idf89b2e6a0b777adbfb6370ea34f35faee6d4965
2019-04-09 21:35:37 -07:00
Mathieu Chartier d7d6e9d671 Merge "Specify default image block size of 512KB by default" 2019-04-09 15:31:54 +00:00
Paul Duffin 70a875afec Merge "Remove android.test.base from bootclasspath" 2019-04-09 10:35:41 +00:00
Mathieu Chartier 6cbc3899b3 Specify default image block size of 512KB by default
Enables parallel decompression.

Test: manual
Bug: 116052292
Change-Id: I172935c8dd9c729199d9015e82487f84018bb9f4
2019-04-08 13:56:40 -07:00
Paul Duffin fad04b7591 Remove android.test.base from bootclasspath
Default to exclude android.test.base from the bootclasspath unless the
REMOVE_ATB_FROM_BCP flag is set to false.

Bug: 73711752
Test: make droid, flash, atest -p cts/tests/signature/
Change-Id: Iabcda707ff0f0b4ec7cade1125938a2759af8f76
2019-04-08 10:32:05 +01:00
Anton Hansson 66bd1852f1 Enable JIT Zygote experiment in mainline boardconfig
Like Ie413f84c545c869ee336912a7b05ca80bb968129, but for all
mainline devices.

Bug: 119800099
Test: m
Change-Id: Ief77adaea61203a013f85cf870c5350253fdb7dd
2019-04-05 18:45:17 +01:00
Anton Hansson 91aa9414c0 Move device-specific vars from mainline common
Move a couple of variables out of BoardConfigMainlineCommon
because they vary either by device or by how they build in
AOSP vs internal.

Bug: 80410283
Test: presubmit
Change-Id: Ia42df91ad8c8d8fc4618be375a17ea23896f4352
2019-04-04 17:33:51 +01:00
Yifan Hong 058ddaea8d Merge "Add libcgrouprc.so to LL-NDK" 2019-04-03 19:08:51 +00:00
Anton Hansson 7369b7622f Merge "Add more product defaults to mainline.mk" 2019-04-03 08:28:06 +00:00
Nicolas Geoffray 31a7dee48b Merge "Re-order the ext/framework boot jars in bootclasspath." 2019-04-03 07:27:55 +00:00
Yifan Hong 4ceadcda40 Add libcgrouprc.so to LL-NDK
Bug: 123664216
Test: builds
Change-Id: I8228580879c6eb3d44a9111a6ed09b328df4a2c8
Merged-In: I8228580879c6eb3d44a9111a6ed09b328df4a2c8
2019-04-02 22:32:34 -07:00