Commit graph

3048 commits

Author SHA1 Message Date
Roland Levillain
53ccc72179 Revert^2 "Add the Android Runtime APEX module to PRODUCT_PACKAGES."
Unless specified otherwise (using `DONT_INCLUDE_RUNTIME_APEX`).

This reverts commit 4c39bd2c6e.

Test: make systemimage on taimen-userdebug
Test: make systemimage on marlin-eng
Test: make systemimage on marlin-userdebug
Test: make systemimage on sailfish-userdebug
Bug: 113373927
Change-Id: I1f1f0ffcc7bb6bf26d4df72613a806d2d73c5e82
2018-11-13 20:20:05 +00:00
Anton Hansson
8879840c52 Add llkd to mainline_system
Bug: 110410711
Test: lunch mainline_arm64; m
Change-Id: Idb42e91ee9dcb91a0ca5c0e3eabf293a1213ff32
2018-11-13 15:19:34 +00:00
Roland Levillain
4c39bd2c6e Revert "Add the Android Runtime APEX module to PRODUCT_PACKAGES."
This reverts commit cb6e935db8.

Reason for revert: Increases the system image size beyond the
limit for some targets (e.g. marlin).

Bug: 113373927
Change-Id: Ia609523a60179c32d377d0735049c944464ea0cc
2018-11-12 17:24:59 +00:00
Roland Levillain
d9d0e35652 Add some ART people as OWNERS of target/product/runtime_libart.mk.
Test: build/make/tools/checkowners.py -c -v build/make/target/product/OWNERS
Bug: 113373927
Change-Id: I7780803432b53b9a1ab42b7bb80695a200f2e386
2018-11-12 14:12:56 +00:00
Jordan Liu
a9ce0ce07a Merge "Add radio config version 1.1" 2018-11-09 18:50:35 +00:00
Roland Levillain
cb6e935db8 Add the Android Runtime APEX module to PRODUCT_PACKAGES.
Test: make systemimage
Bug: 113373927
Change-Id: I49c01fd40b2b777128586161e4c6ece6c5aea293
2018-11-07 15:36:14 +00:00
Anton Hansson
8af128d703 Add libfwdlockengine to mainline_system
Required by certain ringtones, apparently (though I couldn't find
what actually uses this library).

Bug: 80410283
Test: lunch mainline_arm64; m
Change-Id: I36b5b07156b41c442903d7d07e6b9d9f4abe2345
2018-11-06 17:29:32 +00:00
Anton Hansson
cac5bff8ae Add TimeZoneUpdater apk to mainline /system
This is disabled by default, but can be enabled via a
config overlay.

Bug: 116191025
Bug: 80410283
Test: make
Change-Id: Ibfe5d85580ccccc774de166750d91efd74458a8d
2018-11-06 11:23:29 +00:00
Peiyong Lin
318dde33d3 [GPU Service] Add gpuservice into PRODUCT_PACKAGES.
BUG: 118347356
Test: Build, flash, boot, `adb shell cmd gpu vkjson` to verify
Change-Id: Ib9a7d13817853da040c8c4059beca90418de4621
2018-11-03 15:01:17 -07:00
Jiyong Park
90418404d4 Remove apex_debug_key
Remove apex_debug_key, in favor of apex.test.key which is under
/system/apex and is built with soong.

Bug: 118213152
Test: /system/etc/security/apex/testkey exists
Change-Id: Iaa0facea2d26cadd48783778e8915bc3c560de10
2018-11-02 14:36:08 +09:00
Treehugger Robot
c03653720f Merge "add flags_health_check binary to system_base.mk" 2018-11-01 18:46:52 +00:00
Hongyi Zhang
eaa08d4cd4 add flags_health_check binary to system_base.mk
Test: build succeeded, /system/bin/flags_health_check can be found on
device

Change-Id: Ia8b73d7bbfc6951e580f62b6bebf006211b0ce33
2018-11-01 03:28:19 +00:00
Jiyong Park
53c816f7de Don't check VNDK lib list for PDK builds
Some libs, such as libandroid_net.so and some other Renderscript related
ones, can't be built in PDK due to missing frameworks/base.

Bug: 118634643
Test: build PDK; build doesn't break due to missing VNDK libs

Change-Id: Ic2bf657d796c2044c3b8f49b2963ca84760d54d1
2018-11-01 10:50:27 +09:00
Anton Hansson
3ae69f2990 Add list of locales to mainline_system
Locales not in this list will get stripped.

Bug: 80410283
Test: lunch mainline_arm64; m
Change-Id: I90a63e234e2f2ee32da8f9f257248f5ee6354151
Merged-In: I90a63e234e2f2ee32da8f9f257248f5ee6354151
(cherry picked from commit d994b0dc98)
2018-10-30 08:54:30 +00:00
Anton Hansson
41ec0a65a4 Merge "Add vendor restrict to mainline targets" 2018-10-30 07:43:55 +00:00
Anton Hansson
123f8e73ed Add vendor restrict to mainline targets
Prevents additions of non-aosp artifacts to these products.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Test: lunch mainline_system_arm64; m nothing
Change-Id: Id12a77bd7f4cc9917aecbca76e8a2842d7c77613
2018-10-29 16:25:49 +00:00
Anton Hansson
284b81c1ae Add a mainline arm64 device
The existing 'generic' targets are emulator devices, and targeting
it has the side-effect of including emulator-specific artifacts.

Create a mainline device instead, which is really generic. This also
allows specifying tweaks unsuitable for the emulator.

Include BoardConfigGsiCommon for now, even though it includes a few
things we likely won't want in the future.

Bug: 80410283
Bug: 111538404
Test: lunch mainline_arm64; m
Change-Id: I15e7cb41fcbd3c0592a091ba7a8575ddf10bda71
2018-10-29 16:15:04 +00:00
Treehugger Robot
f26f313d17 Merge "libvixl-arm and -arm64 are no longer VNDK libraries." 2018-10-24 01:41:57 +00:00
Jordan Liu
1eba69d346 Add radio config version 1.1
Version 1.1 includes EID as part of SimSlotStatus.

Test: make
Bug: 116656814
Change-Id: Ief5e866fc2fd91563a02684fa74bcc37081bf1be
2018-10-23 15:15:31 -07:00
Florian Mayer
0c41ee3b35 Merge "Build heapprofd per default." 2018-10-19 20:45:02 +00:00
Anton Hansson
058f33ec0f Merge "Remove PRODUCT_SHIPPING_API_LEVEL in mainline_system" 2018-10-18 15:32:47 +00:00
Anton Hansson
b65a5ba193 Remove PRODUCT_SHIPPING_API_LEVEL in mainline_system
Let this be defined in the leaves instead. As is it frequently causes
problems where the product inheriting this also inherit another value
of PRODUCT_SHIPPING_API_LEVEL, leading to invalid values unless
overridden again.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Test: lunch mainline_system_arm64; m nothing
Change-Id: Id08b6cc0cd8815404e548c521c9e40706ba8ca16
2018-10-18 13:40:22 +01:00
Jiyong Park
c551b22f44 libvixl-arm and -arm64 are no longer VNDK libraries.
libvixl-arm and libvixl-arm64 are not used by any vendor libraries, but
only by ART. Removing them from VNDK.

Test: m
Change-Id: I5b83be13cd70fb12581fe561798484a8907022c6
2018-10-18 20:37:38 +09:00
Anton Hansson
fc1e1a54cd Merge "Add PresencePolling to mainline_system" 2018-10-18 08:04:19 +00:00
Anton Hansson
471a45b952 Merge "Re-submit "Add trailing slash to mainline path claims."" 2018-10-18 08:03:53 +00:00
bohu
9b4e805a4d fix generic_x86_arm
To make the generic_x86_arm bootable.
Third party translabor binary can be added on the resulting
system.img and be tested at least on emulator.

BUG: 117673798

Change-Id: Iffbcf9217bbedc12ba83a4851e84ecbf299bf8e7
Merged-In: Iffbcf9217bbedc12ba83a4851e84ecbf299bf8e7
2018-10-17 21:57:15 +00:00
Anton Hansson
da02e8619a Add PresencePolling to mainline_system
Missed adding this app in I5afabc7dcc4ca320f06fdc4a2669fb1b81e53b0b.
It is usually added in conjunction with RcsService.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: Ic721d1dcef479a03f4b603bd77a91801ea9dd9ec
2018-10-17 18:04:46 +01:00
Anton Hansson
dcb5ef1333 Re-submit "Add trailing slash to mainline path claims."
With a workaround for preopt files that get installed into an unknown
path. The BoardConfig defines whether the files go in /system_other,
so allow that.

This reverts commit 46bf4b510c.

Test: lunch mainline_arm64-userdebug; m nothing
Change-Id: Ia75670eb6e3730ad0ff17f5b81954b69f6cab22b
2018-10-17 16:40:29 +01:00
Anton Hansson
28e0f0353c Fix typo
We want to add to PRODUCT_PACKAGES_DEBUG, not overwrite it.

Test: make
Change-Id: Ib67d20e33b30edd76ca24ce208f899cb4c25004c
2018-10-17 09:08:27 +01:00
Anton Hansson
7f758720f6 Merge "Add some debug binaries to mainline_system" 2018-10-17 07:23:18 +00:00
Anton Hansson
bb449e0bd4 Merge "Add the default charger images to mainline_system" 2018-10-17 07:20:54 +00:00
Tom Cherry
6195b3578a Separate init packaging for mainline
With system-as-root, both first and second stage init belong to
system, but without system-as-root, first stage belongs to vendor and
second stage belongs to system.  This change references two phony
packages that include the right parts of init for systen and vendor.

Bug: 117606184
Test: mainline builds work properly
Change-Id: I997309655fef28cb1c3d4b3be989c035b5c6488d
2018-10-16 09:58:54 -07:00
Anton Hansson
aa236882c0 Add the default charger images to mainline_system
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I539b57ef436be3d6209d6436fae6c5eb75832bf7
2018-10-16 17:34:33 +01:00
Anton Hansson
36c5d0d1cc Add some debug binaries to mainline_system
These binaries are commonly included in debug builds, so include
them on mainline too.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: If0adfb4795ea82e158a0218d9c16d897012dd8b5
2018-10-16 16:15:39 +01:00
Florian Mayer
a910ba41c8 Build heapprofd per default.
See go/heapprofd for details. This will be used to profile the memory
usage of system services and apps.

See https://b.corp.google.com/issues/111289182#comment2 for system
health approval.

Change-Id: I2cf3af57e22c39c968afc0ca971f1d3862e27fe2
2018-10-15 14:14:55 +01:00
Anton Hansson
46bf4b510c Revert "Add trailing slash to mainline path claims."
This reverts commit f1fb31a301.

Reason for revert: breaks some builds

Change-Id: I22f7939dc25bee6e3c2b8835f86ce5772ab3edec
2018-10-15 10:13:35 +00:00
Anton Hansson
f1fb31a301 Add trailing slash to mainline path claims.
Fixes a bug where system_other/ paths are considered part of
the "system" path.

Test: lunch mainline_arm64; m nothing
Change-Id: Id7aad41ea285f545260289f59e55c251677bdc38
2018-10-12 11:10:17 +01:00
Treehugger Robot
0c833a7fba Merge "Add ANS to telephony systems" 2018-10-12 04:41:09 +00:00
Steven Moreland
bb0d85169f Merge "VNDK-core += android.hidl.safe_union@1.0.so" 2018-10-11 21:23:27 +00:00
Steven Moreland
637b675b89 VNDK-core += android.hidl.safe_union@1.0.so
Bug: 116156870
Test: build & boot
Change-Id: I6712d035d5a30ed3e06acf9503e00231053ce6ce
2018-10-11 09:53:45 -07:00
Sooraj Sasindran
0d4a3c2e46 Add ANS to telephony systems
Add ANS to telephony systems

Bug: 114793357
Test: verified it using developer options
Change-Id: Id31be8524934b47345ba95954636822eb59264ac
Merged-In: Id31be8524934b47345ba95954636822eb59264ac
2018-10-10 20:40:52 +00:00
Tom Cherry
16f45d6cd9 Whitelist TARGET_COPY_OUT_RAMDISK for mainline
Test: mainline builds without BOARD_BUILD_SYSTEM_ROOT_IMAGE set.
Change-Id: Ia3a5bfa6d2ba1872710409d8c88bba6ff710a1c6
2018-10-09 10:41:01 -07:00
Treehugger Robot
976f1d4577 Merge "base_system: Add iorapd as core product target" 2018-10-08 20:12:59 +00:00
Igor Murashkin
962e2dde0a base_system: Add iorapd as core product target
This makes iorapd be built as part of the system image
with a regular 'make' command.

Part of a topic that has 'iorapd' start up by init_rc.

Bug: 72170747
Change-Id: I300bc35f508fbe36bf0f545e20236c718392d571
2018-10-05 16:28:12 -07:00
Anton Hansson
65fd432a91 Merge "Add a few apps to mainline_system." 2018-10-03 10:32:57 +00:00
Jayant Chowdhary
8a8cf7b081 Merge "Reland "Add libbinderthreadstate to the VNDK.""" 2018-10-02 20:14:37 +00:00
Jayant Chowdhary
18a75cb2c4 Reland "Add libbinderthreadstate to the VNDK.""
This reverts commit 13467f5993.

Reason for revert: Dependencies which broke tests due to exclusion from 
                   LOCAL_JNI_SHARED_LIBS have been added.

Change-Id: I4aca69d7bfa12a132b8334deb61ed350b434f5df
2018-10-01 22:52:07 +00:00
Anton Hansson
0820a93d69 Merge "Add wrapped net utils to mainline_system." 2018-10-01 17:22:05 +00:00
Anton Hansson
c941007331 Add bluetooth libraries to mainline_system.
These are included on current mainline devices.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I1c214c760f3f668804baef642f1c7121d0723bfb
2018-10-01 10:55:35 +00:00
Anton Hansson
017e68e6cd Add a few apps to mainline_system.
- LiveWallPapersPicker is included virtually everywhere
- PartnerBookmarksProvider is required by other apps
- SafetyRegulatoryInfo shows html content from a res overlay
- DMService, RcsService and Stk are all telephony apps
  of some sort.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I5afabc7dcc4ca320f06fdc4a2669fb1b81e53b0b
2018-10-01 11:54:22 +01:00
Anton Hansson
2df4bce8b8 Add wrapped net utils to mainline_system.
For /vendor to access net utils.

Test: lunch mainline_arm64; m nothing
Bug: 80410283
Change-Id: I317ed0f70271af6304d71ed669e7d1b17b3e19c0
2018-10-01 11:45:22 +01:00
Anton Hansson
bfa4338842 Add the nfc_extras shared lib to mainline.
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I5bdc32988ced9c0b93bb54bc8cb88ead7efe4fcb
2018-09-28 15:14:59 +01:00
Anton Hansson
cae7ba396c Merge "Add preopt scripts to mainline." 2018-09-28 10:49:00 +00:00
Remi NGUYEN VAN
ebf81b36cf Merge "Revert "Add libbinderthreadstate to the VNDK."" 2018-09-28 09:42:53 +00:00
Remi NGUYEN VAN
13467f5993 Revert "Add libbinderthreadstate to the VNDK."
This reverts commit e99863d896.

Reason for revert: This breaks framework tests and blocks presubmit

Change-Id: I50be59542c0bc655c310fbd15cc55f3b32947453
2018-09-28 07:50:45 +00:00
Treehugger Robot
cb1a99a676 Merge "Added android.hardware.atrace 1.0 to VNDK" 2018-09-28 01:16:13 +00:00
Wei Wang
ccf68e0231 Added android.hardware.atrace 1.0 to VNDK
Bug: 111098596
Test: atrace/systrace

(cherry picked from commit 70ed2ec2f1)

Change-Id: I68c552591875473ad7c51753ebdc77b986c6a73d
2018-09-27 16:39:24 -07:00
Jayant Chowdhary
2f12a56593 Merge "Add libbinderthreadstate to the VNDK." 2018-09-27 21:02:35 +00:00
Anton Hansson
deec280bbb Add preopt scripts to mainline.
These scripts support art preopting in system_other, which is
a generically useful thing to keep on mainline.

Note that the preloads_copy script should also be added, but
that needs some work to be done (b/116714695).

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I693e17ac0f61f2417ced639d1fdfe164c54341a9
2018-09-27 11:18:11 +01:00
Jayant Chowdhary
e99863d896 Add libbinderthreadstate to the VNDK.
Bug: 110364143

Test: make -j64

Change-Id: I28259136fa26ff7aaf73e37862fa4c87397cd763
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2018-09-26 11:07:29 -07:00
Anton Hansson
889018d3d6 Include AOSP telephony apps in mainline_system.
These apps are included on all mainline devices. Including them
necessitates splitting telephony.mk into two pieces, as "rild"
installs on /vendor.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: Id4f1684604c71e853c8096e9a6992e65b6dfefed
2018-09-26 16:28:13 +01:00
Anton Hansson
1b66873130 Fix vendor include in mainline_arm64.
Include all the _vendor equivalents of the mk's included by
mainline_system. The previous include was a typo.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I71cf6509ad67ed28908716356228ef3980823bf6
2018-09-26 16:28:06 +01:00
Przemyslaw Szczepaniak
4da4d6cc89 Merge "Add NeuralNetworks HAL v1.2 to VNDK" 2018-09-24 12:25:55 +00:00
Treehugger Robot
6466b3a334 Merge "Add keys for APEX images for eng/userdebug." 2018-09-24 09:44:22 +00:00
Slava Shklyaev
aa244e95ae Add NeuralNetworks HAL v1.2 to VNDK
Bug: 114365802
Test: m check-vndk-list
Change-Id: I367869b5aa231175ad1a96518c6950b131d90b8f
Merged-In: I367869b5aa231175ad1a96518c6950b131d90b8f
(cherry-picked in 0bafe4902b)
2018-09-21 14:44:47 +01:00
Tianjie Xu
0f68c1386c Add recovery-persist to base_system
We moved the recovery metric parsing to the native code, which executes
on the next normal build and stays under the system partition. Also,
the recovery-persist binary needs to be installed on both A/B and
non-A/B devices. Therefore, adds recovery-persist to base_system to
avoid breaking the mainline targets.

Bug: 114278989
Test: build mainline target
Change-Id: I251ef862d9342b0dc308223ee6c48849f098bb1e
2018-09-20 12:42:08 -07:00
Yifan Hong
6a43200f89 Merge "health filesystem HAL renamed to health storage HAL" 2018-09-20 17:26:53 +00:00
Martijn Coenen
3508ef69fc Add keys for APEX images for eng/userdebug.
These keys will be used to sign and verify APEX modules on
eng/userdebug devices. The keys may still change, but are
added now to unblock apexd development.

The keys were generated as follows:

$ openssl genrsa -out apex_debug_key.pem 4096
$ avbtool extract_public_key --key apex_debug_key.pem --output apex_debug_key

We'll probably need PRODUCT_APEX_KEYS at some point, but we'll wait
with that until we have build support.

Bug: 112684055
Test: /system/etc/security/apex/apex_debug_key found on-device
Change-Id: I5f4b1cb1eb11be6431146aa4297b50205fbc382e
2018-09-20 06:48:51 +00:00
Yifan Hong
9596c71bc6 health filesystem HAL renamed to health storage HAL
Bug: 111655771
Test: compiles
Change-Id: Ia245102f7af958b7ee7e811342a63b7325d7482b
Merged-In: Ia245102f7af958b7ee7e811342a63b7325d7482b
2018-09-19 13:11:41 -07:00
Hung-ying Tyan
5f8eb7c553 Revert "Revert "Add VNDK v28 to GSI from Android Q""
This reverts commit ffdbab3ff3.

Bug: 113560265
Test: (with the topic) build aosp_arm-userdebug and app only with and without vndk 28
Change-Id: I68a74ba5544a262414e777d8f07bc1ea18f24235
2018-09-19 17:55:29 +08:00
Colin Cross
c70c69e740 Merge "Revert "Add VNDK v28 to GSI from Android Q"" 2018-09-18 00:35:01 +00:00
Colin Cross
ffdbab3ff3 Revert "Add VNDK v28 to GSI from Android Q"
This reverts commit 6c4578b64e.

Reason for revert: breaks unbundled app builds that don't have prebuilts/vndk

Bug: 113560265
Change-Id: I7c067fda1a369c67866eb8f327eb61170bb26533
2018-09-17 20:25:21 +00:00
Treehugger Robot
5c3907f922 Merge "Add VNDK v28 to GSI from Android Q" 2018-09-17 10:00:54 +00:00
Steven Moreland
ccc7ce1050 Remove HIDL libs from PRODUCT_BOOT_JARS.
These are left in PRODUCT_PACKAGES so that they can still
be added to the classpaths of legacy targets.

Bug: 77307025
Test: boot Pixel 2

Change-Id: Ib14969291319e03f181b9ea4d40096de095137e7
2018-09-12 09:17:01 -07:00
Treehugger Robot
217f0defe9 Merge "Add fastboot HAL to VNDK" 2018-09-08 02:47:40 +00:00
Hridya Valsaraju
3482c89303 Add fastboot HAL to VNDK
Bug: 79480454
Bug: 78793464
Test: make

Change-Id: Ib9fa4161579d666a3276a1a4193b750b64653760
2018-09-06 21:21:16 -07:00
Treehugger Robot
7d1be8148e Merge "Rename to android.test.base.impl" 2018-09-07 01:01:59 +00:00
SzuWei Lin
6c4578b64e Add VNDK v28 to GSI from Android Q
From Android Q, Legacy GSI (aosp_$arch_a(b)-userdebug) can only
support the devices which upgraded from O or O-MR1.

The normal GSI (aosp_$arch-userdebug) will support the device which
launch from P or Q.

The patch add VNDK v28 to Legacy GSI and normal GSI.

Bug: 113560265
Test: lunch aosp_arm64_ab-userdebug; make -j
      Check the folder $OUT/system/lib64/vndk-28 existing

Change-Id: I941d2cd56264fffc3ded338871409594a430dce5
2018-09-06 09:25:16 +08:00
Steven Moreland
5fd1022106 Merge "Install libbinder_ndk to the system." 2018-09-06 00:04:38 +00:00
Steven Moreland
9d5549675a Install libbinder_ndk to the system.
This library is in the NDK, so it needs to be guaranteed to be
installed even thought there are no platform dependencies on it.

Bug: 111445392
Test: it is installed
Change-Id: Iba7b224f0d95c62634a728ce7e178af6d08aa7dc
2018-08-29 20:52:48 -07:00
Tri Vo
7a7e441379 Add android.system.suspend@1.0-service to base_system.mk
Bug: 78888165
Test: presubmit
Change-Id: I644ebc0704749dbbb7840563d237736babcb003a
2018-08-29 20:35:13 -07:00
Martijn Coenen
9e913d0fcf Merge "Add apexd to base_system." 2018-08-27 17:24:11 +00:00
Anton Hansson
33611b1173 Add OTA support to mainline_system.
update_engine applies an OTA, and update_verifier verifies
partitions post boot.

Note that this also adds cacerts_google as it's a required module by
update_engine, so this reduces the disparity between pixel /system
and mainline_system /system by ~100 files.

Bug: 110410711
Bug: 111495787
Test: make
Change-Id: Idd31407bbd5543fe1dd2b52e87894ac501a025df
2018-08-22 17:48:52 +01:00
Treehugger Robot
8e639205d7 Merge changes from topic "from-pi-gsi"
* changes:
  Fix unbundled branch by not having it pick up goldfish dependency
  Add emulator audio policy config in /vendor not /system
  emulator: factor vendor partition out of emulator.mk
2018-08-22 04:14:25 +00:00
Tao Bao
696bb33676 Install recovery etc files to recovery/root/system/etc.
They used to be installed under recovery/root/etc. This CL moves the
files to the new location and creates a symlink from /etc to /system/etc
(done by the rule in system/core/rootdir). This gives similar layout
between normal boot and recovery, and allows installing prebuilt_etc
files with Soong (`recovery_available: true`).

As part of the change, we no longer need the whitelisting rule for
mke2fs.conf.

Bug: 112780007
Test: Build with other changes in the topic (aosp_taimen-userdebug).
      Check the generated files under recovery (/etc being a symlink to
      /system/etc).
Test: Boot into recovery. Verify basic functionalities (`adb shell` and
      `adb sideload`, factory reset).
Test: `build/soong/build_test.bash --dist`
Change-Id: Ibb6dea6f179a339f0c2d0fd8ba05ec0085b79a12
2018-08-21 10:30:49 -07:00
Hyunyoung Song
3aa57d8d90 Fix unbundled branch by not having it pick up goldfish dependency
Bug: 110165361

Change-Id: I0824b140fdfee296288c03fd03a3bac7966e9179
Merged-In: I0824b140fdfee296288c03fd03a3bac7966e9179
(cherry picked from commit 16e7004e3f)
2018-08-21 06:55:33 +00:00
Kevin Rocard
b4150586c5 Add emulator audio policy config in /vendor not /system
audio_policy_configuration_generic.xml is pushed in /system as the default
configuration (used if the vendor does not provide one in /vendor or /odm)
and for the emulator.

As a result it can be parsed by 2.0 and 4.0 audio HALs. The format
is retro-compatible, but not forward-compatible.

Additionally, the generic config pushed in /system should never be used
as the vendor should always provide a configuration file describing its
target architecture. Thus it should not be part of the GSI.

Those files were originally pushed in /system the emulator
target does not provide its own configuration file.
The emulator should provide config file instead in /vendor instead.

Bug: 78543061
Test: sdk_gphone_x86 and aosp_x86_64 emulator has audio
Test: adb shell cat /vendor/etc/audio_policy_configuration.xml | diff - \
          frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml
Change-Id: Ice43cb4670a82f4e60fcccc58a636d224f240b5a
Merged-In: Ice43cb4670a82f4e60fcccc58a636d224f240b5a
Signed-off-by: Kevin Rocard <krocard@google.com>
(cherry picked from commit dad3ad6126)
2018-08-21 06:42:11 +00:00
bohu
ebbdea824f emulator: factor vendor partition out of emulator.mk
The emulator vendor paritions are better moved out of
emulator.mk into device/generic/goldfish/vendor.mk
so that changes in vendor.mk will just concentrate on
vendor partition.

this cl does not impact real devices, and it does not
even impact emulator images (it does code refactoring only)

BUG: 110030159

Change-Id: Ic5778cda8ca6ccf7bc2bc2f9028f801cda970143
Merged-In: Ic5778cda8ca6ccf7bc2bc2f9028f801cda970143
(cherry picked from commit 6676853016)
2018-08-21 14:40:43 +08:00
Sundong Ahn
73e33eae35 Rename to android.test.base.impl
The name of the runtime library name for the SDK library
android.test.base has changed to android.test.base.impl as it is not
built using java_sdk_library construct where *.impl suffix is
automatically added to the runtime lib.

Bug: 77577799
Test: m -j

Merged-In: I975a42412d3c71f0d7de249c08e715fdfd3eab2c
Change-Id: I975a42412d3c71f0d7de249c08e715fdfd3eab2c
2018-08-20 10:06:17 +09:00
Treehugger Robot
6518cbdadf Merge "Correct PRODUCT_USE_FASTBOOTD USAGE" 2018-08-17 19:07:17 +00:00
Hridya Valsaraju
e06e97464c Correct PRODUCT_USE_FASTBOOTD USAGE
Remove all usage of flag PRODUCT_USE_FASTBOOTD
as it will not be set when these files are processed
by the build system.

Bug: 78793464
Test: make bootimage and check for fastbootd binary in recovery
Change-Id: I371a6d2beddeb54a88281934b54b8c61ead12d4f
Merged-In: I371a6d2beddeb54a88281934b54b8c61ead12d4f
(cherry picked from commit b9d535356b)
2018-08-17 11:40:06 -07:00
Martijn Coenen
520b3f91ed Add apexd to base_system.
apexd is a new daemon responsible for managing APEX packages.

Bug: 112455435
Test: apexd is running
Change-Id: I097495af4a6f7374b4d40da4512e3faf517520a1
2018-08-17 13:50:41 +02:00
Anton Hansson
a43576a0b8 Merge "Remove obsolete wallpapers from core product mks." 2018-08-16 06:49:09 +00:00
Anton Hansson
3d128b88f0 Merge "Add init_second_stage.recovery to base modules." 2018-08-16 06:48:50 +00:00
Tri Vo
0dd056538a Merge "Remove libsuspend from VNDK." 2018-08-15 21:05:31 +00:00
Anton Hansson
ed49241d03 Remove obsolete wallpapers from core product mks.
These packages were removed from a standard checkout in
I7db6b9fbe13d65e717d99d6ee44dd78c8804b05c, and are unlikely
to be used in any other manifests. They were probably just
left here by mistake. Remove them from the core product mks.

Note that the repositories still exist, but they appear to
be abandoned:
https://android.googlesource.com/platform/packages/wallpapers/

Bug: 111729974
Bug: 80410283
Test: make
Change-Id: I3fb2dad49f4f0dd571f73202747f49fcde0563ff
2018-08-15 15:45:52 +01:00
Anton Hansson
b8a6a476c6 Add init_second_stage.recovery to base modules.
It was previously being included as a REQUIRED module of
the init module, but including it separately allows
separating the system and recovery artifacts in different
mk files.

Remove the whitelist entries the previous construct
necessitated.

Bug: 112318375
Test: lunch mainline_arm64 && m nothing
Change-Id: I02d9ac73c65ba58bb2acc7b2046b06b58c723ced
2018-08-15 08:52:12 +01:00
Tri Vo
3639f7fc88 Add android.system.suspend@1.0.so to VNDK-core
Bug: 78888165
Test: n/a
Change-Id: I6d4a6d07996de2d16acc71fe177fca7ef27c640f
Merged-In: I6d4a6d07996de2d16acc71fe177fca7ef27c640f
(cherry picked from commit bdf076a667)
2018-08-14 17:32:55 -07:00
Treehugger Robot
1c8485b713 Merge "Add power@1.3 to the VNDK." 2018-08-14 22:59:36 +00:00
Tri Vo
d0075655c5 Remove libsuspend from VNDK.
Only platform should ever have access to libsuspend

Test: presubmit
Change-Id: Ib0512a6d1739b698046ff468002cfcc41a7fb097
2018-08-14 15:09:57 -07:00
Treehugger Robot
c76b000acb Merge "Add fastbootd to build targets" 2018-08-14 21:25:50 +00:00
Yifan Hong
4684cfbb32 Merge "Add health HAL to recovery." 2018-08-14 21:06:58 +00:00
Steven Moreland
f8b90b42fb Add power@1.3 to the VNDK.
Bug: 110112323
Test: (sanity) build + boot walleye

Change-Id: Ie1cf3fc95b1a0bd53c8cf015df2af10c74979003
2018-08-14 13:34:32 -07:00
Treehugger Robot
7f02e5961a Merge "Added IRadio 1.3 to VNDK" 2018-08-14 18:43:46 +00:00
Treehugger Robot
23d924aee3 Merge "Allow boot control HAL to be used in recovery" 2018-08-14 17:53:15 +00:00
Hridya Valsaraju
06cf5dcce0 Allow boot control HAL to be used in recovery
Bug: 78793464
Test: make boot image and check if HAL is present in recovery

Change-Id: I380220c9bd716062f58e4d675d6a5f7b9460b093
2018-08-13 22:51:29 -07:00
Christopher Ferris
9f7e0cff7f Merge "Remove micro_bench." 2018-08-13 22:11:46 +00:00
Yifan Hong
51a4613728 Add health HAL to recovery.
Add /system/lib[64]/hw/android.hardware.health@2.0-impl-default.so, so that
it can be used by recovery (instead of static linkage).

Bug: 80132328
Test: is_battery_ok works in recovery
Change-Id: I6eaf86a22bc276338cafdcf395b33e08d2366de5
2018-08-13 14:58:57 -07:00
Hridya Valsaraju
91a7e3194b Add fastbootd to build targets
Bug: 78793464
Test: mmm
Change-Id: I0f7101d2ef948c522f8e4cfd51b91d33b59e1866
2018-08-13 10:16:27 -07:00
Jack Yu
9b11c7970a Added IRadio 1.3 to VNDK
Test: Telephony sanity tests
Bug: 110872637
Change-Id: I263d6292f9bc9c2bbe5bc430cf677a04d5bbd920
2018-08-10 17:16:36 -07:00
Treehugger Robot
5b82034475 Merge "Add additional OWNERS for entries to the VNDK." 2018-08-10 23:42:27 +00:00
Steven Moreland
9c8103317c Add additional OWNERS for entries to the VNDK.
The target/product/vndk/current.txt file was added in order
to have a global check on what is included in the VNDK. This
for instance adds as an extra check to make sure that a
device-specific module doesn't end up in this global set.

However, because modifying the VNDK is relatively common, this
puts undue burden on the build team to conduct reviews. For that
reason, I'm opening it up with additional reviewers.

Bug: N/A
Test: N/A
Change-Id: I9827260bde8ec757be363fc153b718d9c0b68f25
2018-08-10 15:15:56 -07:00
Yifan Hong
fb2a43f5ad Add health filesystem HAL to VNDK
Test: builds
Bug: 111655771
Change-Id: Ib8e3f34f0d97a99de62bd00162af993305a1d89e
Merged-In: Ib8e3f34f0d97a99de62bd00162af993305a1d89e
2018-08-09 17:09:28 -07:00
Tao Bao
35edeae74f Merge "Revert "Whitelist system/lib64/libminadbd_services.so for recovery image."" 2018-08-08 16:36:20 +00:00
SzuWei Lin
d7ae1bc169 Enable dynamic image size for all generic devices
We enabled the dynamic image for all generic_* BoardConfig.mk.
If a product makefile which use these BoardConfig.mk, it should
define PRODUCT_USE_DYNAMIC_PARTITION_SIZE to enable dynamic image.

This patch enable PRODUCT_USE_DYNAMIC_PARTITION_SIZE to product
`full` and `mainline_$arch`.

Bug: 71970853
Test: make -j PRODUCT-full-eng dist
Test: make -j PRODUCT-mainline_arm64-userdebug dist
Change-Id: I499b733638165306e3b0512859e205a1b36a9130
2018-08-08 13:52:20 +08:00
Tao Bao
453b4ddcc4 Revert "Whitelist system/lib64/libminadbd_services.so for recovery image."
This reverts commit ba3a54b2c4.

Bug: 112318375
Test: `build/soong/build_test.bash --dist` with the matching recovery CL
      in the topic.
Change-Id: I35e27120fd62884cbb18f4af7315cad1be080ffd
2018-08-07 20:50:29 -07:00
Tao Bao
ba3a54b2c4 Whitelist system/lib64/libminadbd_services.so for recovery image.
Bug: 112318375
Test: `build/soong/build_test.bash --dist` passes.
Change-Id: I4abb70ae45e33d944859741f079203807a3c8ea6
2018-08-07 16:49:31 -07:00
Tom Cherry
12542bdd8e Add more whitelisted artifacts for the recovery image
Bug: 112318375
Test: build succeeds
Change-Id: I4d12af2b1744a9b79ee8b79f7d15e9b7940d7305
2018-08-07 13:14:09 -07:00
Christopher Ferris
e027dd4aef Remove micro_bench.
micro_bench has been deprecated, so remove it from the list of executables
to be built by default.

Bug: 26928775

Test: Builds.
Change-Id: I701b3077ec00c7e75145aeb52463f47bf8ff2f09
2018-08-07 19:57:56 +00:00
TreeHugger Robot
431a392db0 Merge "Enable dyanmic image size for GSI" into stage-aosp-master 2018-08-07 03:36:42 +00:00
Tom Cherry
75308bc5b9 Merge "Include watchdogd where init is included"
am: 1a8473c8de

Change-Id: I3dac363bdf5f785e277c72f33cfca7a966b5b8f1
2018-08-03 12:37:58 -07:00
SzuWei Lin
a2da9a3361 Enable dyanmic image size for GSI
The original size number of GSI are fixed size. Change to give
size by the content with appending 64M bytes space.

Bug: 71970853
Test: `make systemimage` and check the out system.img
Change-Id: I345f5e22c2fee7b553fc3337e9bff0ba28f579e1
Merged-In: I345f5e22c2fee7b553fc3337e9bff0ba28f579e1
2018-08-03 14:47:43 +08:00
Tom Cherry
3bb4cd6af2 Include watchdogd where init is included
watchdogd is now separated out from init, so include it where init is
included.

Bug: 73660730
Test: watchdogd is still included on builds
Change-Id: I8208b4bcfd4e2a948744c241b744daf0be3d1381
2018-08-02 15:40:44 -07:00
Steven Moreland
91c5154a42 Remove vr_hwc from GSI image.
Not all phones support the VR, so on phones
that don't, the inclusion of vr_hwc is causing
VtsHalGraphicsComposerV2_1Target failures.

Bug: 109913118
Bug: 111963599
Test: vr_hwc is not on aosp_arm64_ab
Change-Id: I803b4dddc5a87e35875992ad9421c644698112f1
Merged-In: I803b4dddc5a87e35875992ad9421c644698112f1
(cherry picked from commit 52971ca09b)
2018-07-31 02:48:29 +00:00
SzuWei Lin
9f5ea99a34 Merge "Add A/B update to GSI" 2018-07-23 14:22:56 +00:00
SzuWei Lin
d13c1719b9 Add A/B update to GSI
The feature should work fine on the devices with partition _a and _b.
and will not be enabled on the devices without partition _a and _b.

Bug: 110763858
Test: build aosp_arm64-userdebug and aosp_arm64_ab-userdebug
Change-Id: I9f783dd6fe69eff2536a6aac0506e41c724510b2
Merged-Id: I9f783dd6fe69eff2536a6aac0506e41c724510b2
2018-07-23 06:48:22 +00:00
Christopher Ferris
175a63112a Merge "Add a few unwinder tools to debug tools."
am: ae08b51891

Change-Id: I64a9f4deabdd28ab09706ad046b901cb26b5af1d
2018-07-21 12:45:41 -07:00
Christopher Ferris
8421f6fb9d Add a few unwinder tools to debug tools.
These tools are useful for dumping elf information. Also, some of the
scripts in development are being modified to use some of these tools,
specifically, unwind_symbols.

Test: Do a clean userdebug build and verify that the tools are built.
Change-Id: Id26b8d2220dc542e8aa73d4b701916fa3d2ea804
Merged-In: Id26b8d2220dc542e8aa73d4b701916fa3d2ea804
(cherry picked from commit 6605dc01b4)
2018-07-20 16:06:22 -07:00
SzuWei Lin
0472eec62c Add A/B update to GSI
The feature should work fine on the devices with partition _a and _b.
and will not be enabled on the devices without partition _a and _b.

Bug: 110763858
Test: build aosp_arm64-userdebug and aosp_arm64_ab-userdebug
Change-Id: I9f783dd6fe69eff2536a6aac0506e41c724510b2
Merged-In: I9f783dd6fe69eff2536a6aac0506e41c724510b2
2018-07-20 06:59:14 +00:00
Mac Wang
8c3565d98d Add product_launched_with_k.mk
Bug: 25564210
Test: None
Change-Id: I2afabf6d7720e9f1026f86598c4f6bc392a1c888
2018-07-19 14:37:41 +00:00
Anton Hansson
404d33c578 Move dep on PRODUCT_COPY_FILES to main.mk
Prior to this change the product-installed-files macro didn't include
PRODUCT_COPY_FILES, which is a problem for the artifact path
enforcements. Fix this by moving the dep on PCF into main.mk.

Leave the declaration in Makefile for now.

Test: diff modules_to_install before and after
Bug: 80410283
Change-Id: Ie7ecd5a963aedd2c573f4fe46d327829908aec03
Merged-In: Ie7ecd5a963aedd2c573f4fe46d327829908aec03
2018-07-18 14:05:20 +01:00
Anton Hansson
9fbe84ceee Move dep on PRODUCT_COPY_FILES to main.mk
Prior to this change the product-installed-files macro didn't include
PRODUCT_COPY_FILES, which is a problem for the artifact path
enforcements. Fix this by moving the dep on PCF into main.mk.

Leave the declaration in Makefile for now.

Test: diff modules_to_install before and after
Bug: 80410283
Change-Id: Ie7ecd5a963aedd2c573f4fe46d327829908aec03
2018-07-13 17:16:22 +01:00
Yifan Hong
8b55abd98f Merge "move device_manifest.xml to base_vendor.mk"
am: bc15d75e5c

Change-Id: I9d6a6164cc19f6d1059373907010ace556784a8c
2018-07-12 21:14:41 -07:00
Yifan Hong
45812e5dbe Fix inconsistency in base_vendor.mk
Test: none
Change-Id: Ia980c42b3bae42d25f993194f10e3b24d5bf102b
2018-07-12 18:29:18 +00:00
Yifan Hong
17d4bcb83a move device_manifest.xml to base_vendor.mk
Test: make
Change-Id: I500269591065569f3102d025b222517dfd4e2c84
2018-07-12 11:23:52 -07:00
Anton Hansson
f1429b1c31 Merge "Split generic_no_telephony in two." 2018-07-11 09:55:06 +00:00
Mathieu Chartier
ccd16f7948 Merge "Move ro.config.low_ram back to being a vendor property" 2018-07-10 22:09:14 +00:00
Mathieu Chartier
2fb62c8ea0 Move ro.config.low_ram back to being a vendor property
Bug: 110517986
Test: make
Change-Id: I1394ac1220c290533fbe9641d10c5997362577fd
2018-07-10 13:19:14 -07:00
Anton Hansson
c3d7b36b86 Split generic_no_telephony in two.
Add handheld_system and handheld_vendor makefiles which
together make up generic_no_telephony. Document what belongs
in these files.

Also update mainline_system to inherit handheld_system.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: Ic2f7b3dcaddc2c86a1187a394aebe8dfd86465ee
Merged-In: Ic2f7b3dcaddc2c86a1187a394aebe8dfd86465ee
2018-07-10 17:50:35 +01:00
Anton Hansson
cac1fc8b76 Split generic_no_telephony in two.
Add handheld_system and handheld_vendor makefiles which
together make up generic_no_telephony. Document what belongs
in these files.

Also update mainline_system to inherit handheld_system.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: Ic2f7b3dcaddc2c86a1187a394aebe8dfd86465ee
Merged-In: Ic2f7b3dcaddc2c86a1187a394aebe8dfd86465ee
2018-07-10 17:47:15 +01:00
Anton Hansson
34bca8808e Split core_minimal in two.
Add media_system and media_vendor makefiles which
together make up core_minimal. Document what belongs
in these files.

Also update mainline_system to inherit media_system.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I030bb6805bf9ff8971ad2e4ba75fc74ace02124b
Merged-In: I030bb6805bf9ff8971ad2e4ba75fc74ace02124b
2018-07-10 16:49:05 +01:00
Anton Hansson
c16e2b2878 Split core_minimal in two.
Add media_system and media_vendor makefiles which
together make up core_minimal. Document what belongs
in these files.

Also update mainline_system to inherit media_system.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I030bb6805bf9ff8971ad2e4ba75fc74ace02124b
2018-07-10 16:45:03 +01:00
Anton Hansson
0b14a57aaf Merge "Make including missing modules an error."
am: 65dc646c76

Change-Id: I7cf277de314e06d84cc19c0def52cd035bbae51a
2018-07-09 23:37:57 -07:00
Anton Hansson
a37da42c12 Merge "Align base_system and core_minimal with internal." 2018-07-10 06:29:13 +00:00
Anton Hansson
65dc646c76 Merge "Make including missing modules an error." 2018-07-10 06:28:41 +00:00
Anton Hansson
b02bda26bd Merge "Move packages from base_system to base_vendor." 2018-07-10 06:27:30 +00:00
Anton Hansson
56a3498703 Merge "Remove redundant packages from core_minimal.mk" 2018-07-10 06:27:08 +00:00
Anton Hansson
60389468a7 Merge "Move packages from base_system to base_vendor." into stage-aosp-master 2018-07-10 05:59:38 +00:00
Anton Hansson
0546208495 Merge "Remove redundant packages from core_minimal.mk" into stage-aosp-master 2018-07-10 05:59:19 +00:00
Mathieu Chartier
cab7408131 Merge "Add logic to preopt both archs for SDK libs"
am: f3c54cfa78

Change-Id: I1f0336118e71c7da5fa5526425121811c0faace6
2018-07-09 12:58:13 -07:00