Commit graph

4481 commits

Author SHA1 Message Date
Steven Moreland
21e8cbd570 Merge "Remove libhidlcache" 2019-07-23 15:51:17 +00:00
Steven Moreland
ef85b4c4d4 Add libbinder_ndk to ll-ndk.
So that it is always in sync w/ system libbinder.

Bug: 136027762
Bug: 138152918
Test: binderVendorDoubleLoadTest
Change-Id: I46f896ee979d41ed67ac47b7c84652b4b49aa8c9
2019-07-23 01:28:32 +00:00
Steven Moreland
34f1c35a60 Remove libhidlcache
This is unused, and there are plans in the future
to use fwk IMemory everywhere.

Bug: 136027762
Test: N/A
Change-Id: I5f2eb40542d3127c08e4f74caa6adb3cd2bfbac1
2019-07-22 10:46:07 -07:00
SzuWei Lin
b3e9fc2219 Add default LMK properties to GSI
These LMK properties are product properties. The configuration will
be absent when GSI is installed as GSI doesn't mount the product
partition. Without these settings, some CTS test cases could
fail due to an aggressive LMK.

The patch puts these properties in GSI as default values.

Bug: 136212765
Bug: 134460917
Test: `run cts -m CtsFileSystemTestCases`, all pass
Change-Id: I6fde8db51debcb9bb269aece3a3e4c7e5bb991f6
Merged-In: I6fde8db51debcb9bb269aece3a3e4c7e5bb991f6
(cherry picked from commit 9547929af4)
2019-07-16 16:53:12 +08:00
SzuWei Lin
d2a6aa8525 Whitelist dexpreopt files for SdkSetup
aosp_product.mk removed the wildcard dexpreopt items. Any apk
requires to whitelist them also.

Bug: 135502030
Test: build aosp_arm-userdebug
Change-Id: Ibb1e6bfe6136a2e63f92e0305b3b939f08127428
2019-07-10 12:28:13 +08:00
Treehugger Robot
4899beb4bf Merge "Revise GSI targets to inherit from mainline_system directly" 2019-07-10 03:49:27 +00:00
SzuWei Lin
df09892cdb Revise GSI targets to inherit from mainline_system directly
The patch seperates gsi_common.mk to aosp_product.mk and
gsi_release.mk. Let GSI targets can be inherit with 3 parts:

- system: mainline_system.mk
- product: aosp_product.mk
- vendor: none or emulator vendor makefiles

aosp_product.mk includes the AOSP packages/settings will be in
the product partition.

GSI targets also includes the gsi_release.mk, which contains
the special settings for the GSI for releasing, ex.
skip_mount.cfg, extra VNDK, etc. After the patch, the build
targets inherit from aosp_$arch.mk will not apply these special
settings anymore.

The gsi_common.mk, legacy_gsi_common.mk and aosp_$arch_ab.mk will
be phased out later.

Bug: 135502030
Test: build gsi_arm64-userdebug and aosp_arm64-userdebug, compare
Test: root, system and vendor in out folder with/without the patch
Change-Id: Ic604ac91ba9a704e6507bac324d19bbf68063464
2019-07-09 18:13:22 +08:00
Justin Yun
6151e3f1ea Rename product_services to system_ext
Bug: 134359158
Test: build and check if system_ext.img is created
Change-Id: I67f2e95dd29eac6a28e07e24ea973d3a134c3bfc
2019-07-09 08:57:19 +00:00
Treehugger Robot
4d77e4da45 Merge "Modify build to put dumpcoverage agent into /system/lib" 2019-06-28 22:41:14 +00:00
Anton Hansson
bf95d43dc6 Merge "Move board config variable from mainline_system" 2019-06-28 09:31:40 +00:00
Kiyoung Kim
4ec56d9214 Merge "Add Linkerconfig to base system target" 2019-06-28 00:46:42 +00:00
Kavi Gupta
7185f8cc2d Modify build to put dumpcoverage agent into /system/lib
This location allows the agent to be attached to arbitrary processes.

It only makes sense to include libdumpcoverage.so on coverage builds,
as these are the only builds that have any information to be dumped.

Test: manual, used examples in README (see other CL) to test whether
it works on a userdebug_coverage build on cuttlefish

Change-Id: Ib2fece1b41a3b5d16c8a2a444c5486137e475fda
2019-06-27 09:28:39 -07:00
Anton Hansson
6ce59eb4f6 Merge "Remove lmk.log_stats sysprop from mainline_system" 2019-06-27 08:28:18 +00:00
Kiyoung Kim
ca019895ef Add Linkerconfig to base system target
Add Linkerconfig to base system target

Bug: 135004088
Test: m -j & Tested from device
Change-Id: I02a3b58854c2f19866f42ba22541737c132daa44
2019-06-27 09:44:58 +09:00
Anton Hansson
c4f11be520 Move board config variable from mainline_system
This variable setting belongs in a board config, not
a product makefile.

Test: presubmit
Change-Id: I41e342ce841ec7aea69ff62aaefdc748cbf28d04
2019-06-26 18:07:05 +01:00
Anton Hansson
fd81f696ed Remove lmk.log_stats sysprop from mainline_system
It is now set on the /product partition by relevant devices.

Bug: 135569569
Test: lunch mainline_system_arm64; inspect system/etc/prop.default
Change-Id: I34696977f584a65741c6002e6688d86e66a1f121
2019-06-26 15:49:10 +01:00
Anton Hansson
528fdc021f Fix non-existing modules check
This variable was accidentally changed to refer to the
shorthand PRODUCT_XYZ instead of PRODUCTS.<mk>.PRODUCT_XYZ
in a previous mass-migration, but that shorthand didn't
exist for these variables. Add it in.

Also whitelist the offender introduced since it was broken.

Test: lunch generic; m nothing
Change-Id: I29dd73c29796743e770afa0c2ceb4f8583dc6e1e
2019-06-25 21:52:58 +01:00
Treehugger Robot
345ed53d98 Merge "Enforce property split in GSI" 2019-06-20 01:53:15 +00:00
Treehugger Robot
435dcbb845 Merge "Disable apex update for GSI" 2019-06-19 10:38:42 +00:00
Neil Fuller
c4924c616c Merge "Remove a host simulation of the runtime module" 2019-06-18 15:33:11 +00:00
SzuWei Lin
79e0d25c33 Enforce property split in GSI
Pure GSI build targets has no vendor partition, such as
aosp_$arch_ab and gsi_$arch. The system properties defined by
PRODUCT_PROPERTY_OVERRIDES will be in /system/build.prop.

The patch defined a fake BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE to
let these system properties flow to vendor and won't pollute the
system.img.

The bug also move some properties to /product/build.prop.

Bug: 135508595
Bug: 131162245
Bug: 134781120
Test: check the /system/build.prop do not have "ro.carrier=unknown"
Test: adb remount on GSI Q on P
Change-Id: Ib200d66cf98fea572c26338e058bce29eb5e0cd7
2019-06-18 18:23:18 +08:00
Isaac Chen
fae280264e Disable apex update for GSI
Currently, GSI does not include apex support and TARGET_FLATTEN_APEX is true.
This will cause issues for vendors with apex support (e.g. Cuttlefish).
This change set ro.apex.updatable to false in product to override that sets
in vendor.

Bug: 135411972
Bug: 134673003
Test: $ lunch aosp_x86-userdebug; m -j; emulator
      $ lunch aosp_cf_x86_phone-userdebug
      # Replace system.img in super.img with GSI
      # The resulted CF could boot and browse the web successfully.

Change-Id: I08fd7a1b254aac276926329e064c35b714764936
2019-06-18 15:57:51 +08:00
Treehugger Robot
4934e72933 Merge "emulator: add option to disable avb" 2019-06-14 11:08:31 +00:00
Dan Willemsen
c84e4cb917 Add missing dependencies to python scripts
These were found when trying to run remotely on RBE with only the
sources depended upon available for each rule.

Bug: 130111713
Test: treehugger
Change-Id: Id763f8fc7dfbe60445f98604db3422147165f537
2019-06-10 23:58:49 +00:00
Neil Fuller
001150ed06 Remove a host simulation of the runtime module
Removes simulated runtime mainline module time zone data files
now that they are no longer needed.

Bug: 132169989
Test: Treehugger only
Change-Id: I8b9665d4b8896d78bf4784d669c86d10dbef54f9
2019-06-10 10:58:13 +00:00
Neil Fuller
69324709f8 Merge "Add a host simulation of the tzdata module" 2019-06-10 10:51:09 +00:00
Neil Fuller
66baeb523d Add a host simulation of the tzdata module
Sets up additional files so that host environments
can now have a simulation of the time zone data
mainline module in addition to the simulation of the
runtime mainline module they already have.

Bug: 132169989
Test: Treehugger only
Exempt-From-Owner-Approval: Cherry-pick; already approved internally
Merged-In: I43dadb150e359bbcb9da61e0187286ac6d38f7c2
Change-Id: I43dadb150e359bbcb9da61e0187286ac6d38f7c2
2019-06-10 10:50:51 +00:00
Anton Hansson
7d679bb26a Make mainline device use apex
The build system default was changed to not support apex, but
we want the mainline device to enable it.

Also re-disable it for GSI.

Test: make
Change-Id: I9a4372d375c2c741d7de5b2f83cac3c4b08767f8
Merged-In: I9a4372d375c2c741d7de5b2f83cac3c4b08767f8
2019-06-10 10:17:27 +01:00
bohu
5b1eed6fbe emulator: add option to disable avb
avbtool spends considerate amount of time, we want
to disable it in build environment to make incremental
build speed a bit faster.

BUG: 133259713

lunch sdk_phone_x86-eng
export QEMU_DISABLE_AVB=true
make -j

Change-Id: I0d227fc5933aaab1d49f66f4b07b35922bc6255b
2019-06-07 09:50:51 -07:00
Kalesh Singh
d1980fa4e3 Add ashmemd_hidl_client to base_vendor.mk product packages.
Change-Id: I77605e7129d4ffa6026f3546adbda61e59f50de0
Bug: 134161662
Test: m -j
2019-06-04 17:02:48 -07:00
Treehugger Robot
523362d544 Merge "Ashmem VNDK library list update" 2019-05-30 07:36:41 +00:00
Kalesh Singh
8030ae0c9c Ashmem VNDK library list update
Added VNDK-core: android.system.ashmem@1.0.so

Bug: 133319042
Test: m -j
Change-Id: Idb0cbe2500376f641534781a9aa95c4b2a8533ee
2019-05-29 11:00:05 -07:00
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