Commit graph

43 commits

Author SHA1 Message Date
Logan Chien
0e9b3e9d5a Remove PRODUCT_EXTRA_VNDK_VERSIONS from AOSP
This commit removes PRODUCT_EXTRA_VNDK_VERSIONS from AOSP branches.
prebuilts/vndk/v27 is missing from these branches.

This commit partially reverts
https://android-review.googlesource.com/c/platform/build/+/682124

Bug: 78605339
Test: aosp_arm64_ab-userdebug builds
Change-Id: Ic64f40dab2d7730f6ebcdf124cd069ed3c845e40
Merged-In: Ibae4a393e6e69f26d7a2d493b93e5739f806147b
2018-05-22 13:45:26 +08:00
Logan Chien
86b52aec24 Build a single GSI for O-MR1-VENDOR and Master-VENDOR
The objective of this commit is to support these 3 combinations:

1. Master-GSI + Master-VENDOR (w/ BOARD_VNDK_VERSION)
2. Master-GSI + Master-VENDOR (w/o BOARD_VNDK_VERSION for upgrading devices)
3. Master-GSI + O-MR1-VENDOR (w/ BOARD_VNDK_VERSION)

This commit defines a new property `ro.vndk.lite` to indicate the status
of BOARD_VNDK_VERSION run-time enforcement.  Now, all devices should
have `ro.vndk.version` so that `libhidlbase.so`, `libRSCpuRef.so`, and
`libnativeloader.so` can find the versioned VNDK directory.

Bug: 78605339
Test: aosp_sailfish Master-SYSTEM + Master-VENDOR boots
Test: aosp_sailfish Master-GSI    + Master-VENDOR boots
Test: aosp_walleye  Master-SYSTEM + Master-VENDOR boots
Test: aosp_walleye  Master-GSI    + Master-VENDOR boots
Test: aosp_walleye  Master-GSI    + O-MR1-VENDOR boots
Change-Id: Iee9553b3ca9e0798a873e655d87d10cdc23d4b1c
Merged-In: Iee9553b3ca9e0798a873e655d87d10cdc23d4b1c
(cherry picked from commit d73b94c097)
2018-05-17 14:25:15 +08:00
Justin Yun
746684376a Use default libnfc-nci.conf if not found in vendor/etc
If libnfc-nci.conf is not installed in vendor/etc, use default
configuration file in system/etc on GSI.

Bug: 72080121
Test: Install GSI and remove vendor/etc/libnfc-nci.conf.
      Check if nfc is available in settings menu.

Change-Id: Icc6e0b1d2b29adacf085cfa68566b064e736d3fa
2018-03-12 23:24:31 +00:00
Justin Yun
e3a7b1b4ca Install ld.config.noenforce.txt instead of copying it
ld.config.noenforce.txt is defined as a module.
For GSI, install the module instead of copying it.

Bug: 70704112
Bug: 70603313
Test: Build GSI and boot on Android-P sailfish device
Change-Id: I894921fa3089411f60d1b4f58ad48e9aa25a519b
2018-01-23 16:13:33 +09:00
Treehugger Robot
b2e9b2b34f Merge "Correct some GSI settings to board makefile" 2018-01-05 08:17:44 +00:00
SzuWei Lin
83890eb262 Correct some GSI settings to board makefile
Some setting currently in target/product/treble_common.mk, but
they should be board config variables. So, move them to
target/board/treble_common.mk.

Bug: 70951849
Test: Build pass and check on a Pixel device with GSI
Change-Id: I511fbc481583555182dab76503e67c5f56efa8eb
Merged-In: I511fbc481583555182dab76503e67c5f56efa8eb
2017-12-26 03:36:33 +00:00
Justin Yun
c104764f73 Use current VNDK directories if version is not set on GSI
Only for GSI, if "ro.vndk.version" property is not defined, the
vendor modules will use current version of VNDK libs.

Bug: 70704112
Test: On Android-P sailfish device, install GSI and check boot
Change-Id: Ib8eb28604ab3e33474179dffbc07358921e7439c
2017-12-23 08:16:59 +09:00
Justin Yun
fc951ff268 Do not enforce VNDK on GSI if VNDK version is not set
If ro.vndk.version is not defined, use the namespace configuration
file that does not enforce VNDK restriction.
This is only for GSI.

Bug: 70704112
Test: Flash sailfish with PI and test with PI GSI image
Change-Id: Ic2b41357905ef47a3483b2eff635e8ae239e28aa
2017-12-21 08:24:36 +09:00
SzuWei Lin
5cde531adb Add vintf into GSI
Bug: 70248004
Test: build pass and check the file in system image
Change-Id: Id3a8dd20e3de5dbba9d6ec222b32fed8817d300b
2017-12-08 11:07:35 +08:00
SzuWei Lin
f786f03656 Add a default apn-conf.xml into GSI
Add a default apn-conf.xml for telephony data network, then some
devices, ex. emulator, could use the default setting when it's
system image overrided by GSI.

Bug: 69869274
Test: build pass and boot a Pixel device with GSI to home screen
Change-Id: I0275a5d420eadcbb2f744e995c9a72a1fb46b935
2017-12-08 10:54:43 +08:00
Hung-ying Tyan
a4a944b717 GSI: add the messaging app
in order to pass
android.telecom.cts.ExtendedInCallServiceTest#testOnCannedTextResponsesLoaded
on GSI.

Bug: 66983288
Test: boot marlin-user with GSI (aosp_arm64_ab-userdebug) and pass the test.
Change-Id: I77a2d59e5525c0e93806312a9cf79be5093523bc
2017-09-28 12:10:16 +08:00
TreeHugger Robot
777d6a036b Merge "Revert "Support TimeZoneRulesManagerService in GSI"" into oc-mr1-dev 2017-09-09 02:28:40 +00:00
Jaekyun Seok
f89dc8488d Revert "Support TimeZoneRulesManagerService in GSI"
This reverts commit b97fd4e603.

Bug: 65001751
Test: no tests
Change-Id: Ia48de712dff393671cd9ce4a9e040ebc16407aa9
2017-09-08 22:22:21 +00:00
SzuWei Lin
558f3dd79b Revise GSI to inherit from aosp_base.mk and telephony.mk
GSI inherited from aosp_base_telephony.mk, but it included some settings for
emulator. So this patch changes to inherit from more pure makefiles to
includes AOSP and telephony modules.

Bug: 65332895
Test: Test on some Pixel devices with GSI, boot to home screen
Change-Id: I98523e864ccf06ddba4422bc8380bc6ff0095d5a
2017-09-06 17:05:08 +08:00
SzuWei Lin
b97fd4e603 Support TimeZoneRulesManagerService in GSI
System Server starts "TimeZoneRulesManagerService" if
"config_enableUpdateableTimeZoneRules" is true in config.xml.

Some projects would turn on "config_enableUpdateableTimeZoneRules"
by resource overlaying in vendor partition.

So, GSI needs to include all required modules for
TimeZoneRulesManagerService.

Bug: 65001751
Test: Build pass and boot with GSI into home screen
Change-Id: Ief929b23411c4fb85633696f47aabd0f065aab91
2017-08-29 09:59:00 +08:00
SzuWei Lin
3cbe82df5f Apply vndk_package to generic system image
Add vndk_package into PRODUCT_PACKAGES, which includes
HAL interfaces, VNDK, VNDK-SP and LL-NDK.

vndk_package increases the total size of GSI content, so
changes the system partition size of:

* 64 bits projects to 1.5GB
* 32 bits projects to 1.0GB

Bug: 64654641
Test: build all GSI projects
Change-Id: I3c66c966eceebd63ee19f6a3de778beed0be6de5
2017-08-17 15:12:53 +08:00
SzuWei Lin
2999f29ea0 Move common 32/64 bits product settings to another files
Move the common 32/64 bits product settings from aosp_xxx.mk to

    target/product/treble_common_(32|64).mk

The original core_64_bit.mk is not match the GSI requirement,
and will be revised soon. So, clone the content of
core_64_bit.mk into treble_common_64.mk.

Bug: 64653300
Test: Build pass
Change-Id: I6154a5c4927287c703a874b5cbf6a7f0c2c3594c
2017-08-14 18:09:49 +08:00
TreeHugger Robot
025d5d910b Merge "treble_common.mk: add the vbmeta.img to disable verification" into oc-mr1-dev 2017-08-12 04:00:18 +00:00
Todd Poynor
6197aba946 thermal: Add Thermal HAL 1.1 to treble_common.mk
Add rev 1.1 of Thermal HAL.

Test: VtsHalThermalV1_1TargetTest; plus manual on marlin
Bug: 30982366
Change-Id: Iaaef326e5d2bad05d934614b79c7c44e7592fdc4
(cherry picked from commit ca0adce235)
2017-08-07 23:02:01 +00:00
Bowgo Tsai
9afc0d5349 treble_common.mk: add the vbmeta.img to disable verification
AVB should be disabled for Treble VTS. Otherwise, OEM devices cannot boot
the generic system.img provided by Google.

Bug: 64055917
Test: Compiles and boot a device with the vbmeta.img
Change-Id: I0eaae7beebc8b901d0b4766c2cdc34a27ad02b59
2017-08-02 21:15:26 +08:00
Niranjan Pendharkar
593767a780 update new HIDL interfaces in generic system image
am: 4584215b55

Change-Id: I644f7e1a1d4ceabbccecfb54914cc723021bac3b
2017-07-31 18:56:11 +00:00
Niranjan Pendharkar
4584215b55 update new HIDL interfaces in generic system image
Test: Boot to home screen
Bug: 36682246
Change-Id: Ia856ed0929caa0c089a62100d17f717519ae5ebf
2017-07-28 08:30:03 -07:00
TreeHugger Robot
30bd2f7e41 Merge "Add netutils-wrapper to generic system image" 2017-07-18 02:45:58 +00:00
Roshan Pius
db0c3a570b treble_common.mk: Add wifi 1.1 package
am: ec35a22d2c

Change-Id: I23d907e900394e152842ab9f737b5a3ca4751c9f
2017-07-17 20:14:16 +00:00
Roshan Pius
ec35a22d2c treble_common.mk: Add wifi 1.1 package
Bug: 63129484
Test: Compiles
Change-Id: Id254722a98dbd25c7016d0902c60151b6573d335
2017-07-17 11:13:17 -07:00
SzuWei Lin
599fefae6b Add netutils-wrapper to generic system image
Bug: 63370530
Test: Build and check the files in system
Change-Id: I2b0f1e10dc5f09ac0fa39ee62df999a1de5e537f
2017-07-12 16:56:43 +08:00
Sundong Ahn
bbab8007c6 configstore: remove configstore 1.1
Configstore was up-revisioned from 1.0 to 1.1. However no new
APIs were added to 1.1. Therefore configstore in dr1 will be down
revisioned to 1.0.

Bug: 63440035
Test: build & run
Change-Id: Ife60328110c6d6cb3e8024fb4a5caabc4c7c034f
Merged-In: I21861448a5d607383b617f2f85bd378013e64090
2017-07-10 15:05:32 +09:00
TreeHugger Robot
e07c2ed19e Merge "Update new HIDL interfaces in generic system image" into oc-dr1-dev 2017-06-28 07:40:58 +00:00
SzuWei Lin
7db5d2c9f3 Update new HIDL interfaces in generic system image
Bug: 63051055
Test: Boot with GSI to home screen
Change-Id: Id5783355e9fae8f48088d4a9eaaf8429425adb45
2017-06-28 09:36:36 +08:00
Bowgo Tsai
952f6a458e Removing vboot 1.0 verity metadata
The generic system.img shouldn't contain any specific verity metadata
because we don't mandate how to do verified boot. Plus, OC-DR devices
use AVB instead of vboot 1.0.

Bug: 62647718
Test: Boot a DR device with the generic system.img
Change-Id: I0966d88d4512621cce7b8abdc28a90a6e312a391
2017-06-27 18:13:56 +08:00
TreeHugger Robot
b1cbbaf528 Merge "Add wificond to Android makefiles" into oc-dr1-dev 2017-06-25 13:49:44 +00:00
SzuWei Lin
fe3191727b Add audio.a2dp.default to generic system image
audio.a2dp.default is a system module. Generic system image includes
audio.a2dp.default to support A2DP if board has the capability.

Bug: 62649731
Test: build and check the file existance in system image
Change-Id: Iac4821b3daf993da9fc309b7b105db98ee4b89ce
2017-06-19 17:59:20 +08:00
SzuWei Lin
cbd421fd0e Remove unnecessary items in treble_common.mk
Bug: 62360563
Test: Build and check files are still exist in system image
Change-Id: Ie787969d072c5b89d377a2c0b01706764185d6a5
2017-06-19 17:58:30 +08:00
SzuWei Lin
af505d5f2f Add wificond to Android makefiles
wificond is part of the framework, and shouldn't be modified by
vendor. The patch adds wificond to PRODUCT_PACKAGES list of
Android makefile, and removes it from treble_common.mk.

Bug: 62646878
Test: Build and check the file existance in system image
Change-Id: I92f2b64c1912ed5106a72a56e831bc989a70979e
2017-06-19 16:06:11 +08:00
SzuWei Lin
4a421a28d0 Merge "Add more libs into generic AOSP system image" into oc-dev
am: 57fb2214ab

Change-Id: I011b16eb3c7ee21a52a04586d8249254e8d53dc8
2017-06-14 09:10:04 +00:00
TreeHugger Robot
57fb2214ab Merge "Add more libs into generic AOSP system image" into oc-dev 2017-06-14 09:06:45 +00:00
Isaac Chen
71891cdb3e Merge "Fix audio policy configuration for generic targets" into oc-dev
am: 34d8c95fd7

Change-Id: I16ab64f6955031bfced51e8049f96f95033624ef
2017-06-14 08:22:36 +00:00
SzuWei Lin
56d68a5192 Add more libs into generic AOSP system image
Includes:
- more HIDL interfaces
- explicitly specify all LL-NDK and SP-NDK (currently only
  libandroid_net is missing)
- add liblzma and libyuv

Bug: 38339299
Test: build aosp_arm64_ab and pass
Change-Id: Ic67d47990cf6b4ab51e1b74f0fed85e60ce3a817
2017-06-14 14:57:15 +08:00
SzuWei Lin
6fdff23df2 Normalize building generic system image with treble-common.mk
Move the common part from make file of generic AOSP system images into
treble_common.mk, and update the content of common part.

The common part inclueds:

- HAL interfaces
- VNDK libs
- VNDK-SP libs
- Some other modules supporting HAL interfaces
- Some Treble default configurations

Bug: 37927875
Test: boot to home screen with the generic system image
Merged-In: I4202454d57970cef713f7d6437191094df0009e9
Change-Id: I4202454d57970cef713f7d6437191094df0009e9
2017-06-13 03:15:39 +00:00
Isaac Chen
924e705c85 Fix audio policy configuration for generic targets
Changes in this CL:
1. Use ":=", instead of "+=", for PRODUCT_COPY_FILES so previous audio
policy related settings won't be overwritten.
2. Use basic audio policy XML files provided by audio team as default.

Bug: 62524944
Test: check if the XML files for audio policy configuration are under
      /system/etc and devices with generic system imagei, but without
      such configuration under /vendor/etc can boot with audio working.

Change-Id: I4ccffdfb131a9d2445d9c2f52a22ffcc97884479
2017-06-12 18:56:50 +08:00
Bartosz Fabianowski
bf1546c96d Revert "Revert "Normalize building generic system image with treble-common.mk""
We will selectively revert on a branch only.

This reverts commit 85c4945f46.

Change-Id: I0eb869a0f2385fe66bd3cd0bc18a298ebe5b47da
2017-06-08 10:12:43 +00:00
Bartosz Fabianowski
85c4945f46 Revert "Normalize building generic system image with treble-common.mk"
Revert by Build Cop. This change is causing build failures across builders and branches, e.g.:

ninja: error: 'out/target/product/generic_x86/obj/lib/android.hidl.base@1.0.so', needed by 'checkbuild', missing and no known rule to make it
09:08:08 ninja failed with: exit status 1

This reverts commit 76ada93856.

Change-Id: I5e7bfa65a70cf5d61fb233cdbdfe7f420fd5ab51
2017-06-08 09:44:49 +00:00
SzuWei Lin
76ada93856 Normalize building generic system image with treble-common.mk
Move the common part from make file of generic AOSP system images into
treble_common.mk, and update the content of common part.

The common part inclueds:

- HAL interfaces
- VNDK libs
- VNDK-SP libs
- Some other modules supporting HAL interfaces
- Some Treble default configuations

Bug: 37927875
Test: boot to home screen with the generic system image
Change-Id: I4202454d57970cef713f7d6437191094df0009e9
Merged-In: I4202454d57970cef713f7d6437191094df0009e9
2017-06-08 10:13:23 +08:00