Commit Graph

4333 Commits

Author SHA1 Message Date
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 e885f35d05 Merge "Add some debug binaries to mainline_system"
am: 7f758720f6

Change-Id: I251cae723eb7efec8823f1501a3d2e2bd075b94a
2018-10-17 00:40:19 -07:00
Anton Hansson 8bafde098f Merge "Add the default charger images to mainline_system"
am: bb449e0bd4

Change-Id: I404000cdf8ecc31a9239bc9ebf0df6763382584f
2018-10-17 00:38:59 -07: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 aafccd7aac Merge "Separate init packaging for mainline"
am: eea8dad05f

Change-Id: I9ddf2c1357793e28e81cf06d31abaa58acf798f6
2018-10-16 13:38:36 -07: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 f9ae891d1c Merge "Revert "Add trailing slash to mainline path claims.""
am: d1874ddf86

Change-Id: I4b945a7432a91b8294395da65542f8c155c361bf
2018-10-15 03:29:21 -07: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 249b60d0d8 Merge "Add trailing slash to mainline path claims."
am: 9d5b3dbf17

Change-Id: I936ddb71273ecab183219aa8614d3683aac66017
2018-10-15 01:48:17 -07: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
Sooraj Sasindran 837eeb1f8e Merge "Add ANS to telephony systems"
am: 0c833a7fba

Change-Id: I960d762d49dc04d26d013511fba5747a0fd5761d
2018-10-11 21:55:17 -07:00
Treehugger Robot 0c833a7fba Merge "Add ANS to telephony systems" 2018-10-12 04:41:09 +00:00
Steven Moreland 3aefd6a480 Merge "VNDK-core += android.hidl.safe_union@1.0.so"
am: bb0d85169f

Change-Id: I42f0cea6881173c68be44c50f0bc2c5ae5bb64ba
2018-10-11 14:44:12 -07:00
Steven Moreland bb0d85169f Merge "VNDK-core += android.hidl.safe_union@1.0.so" 2018-10-11 21:23:27 +00:00
Tom Cherry 4ac9c871b0 Merge "Whitelist TARGET_COPY_OUT_RAMDISK for mainline"
am: 37660e2e32

Change-Id: I4b6bace334b13f8b20a94f37e0154c1b6b14d858
2018-10-11 11:14:22 -07: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
Igor Murashkin 270f1b5897 Merge "base_system: Add iorapd as core product target"
am: 976f1d4577

Change-Id: I4664a8d004e0e100350fa80de532a7a6ed54d6e6
2018-10-08 13:19:21 -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
Bowgo Tsai aba6c98fd2 Merge "Revert "Fix build error for sdk_gphone_x86_64-userdebug""
am: 3e795ee38b

Change-Id: I1f97f0e1c36115e341397bbac76d684a083198d5
2018-10-03 23:52:22 -07:00
Treehugger Robot 3e795ee38b Merge "Revert "Fix build error for sdk_gphone_x86_64-userdebug"" 2018-10-04 06:37:38 +00:00
Bowgo Tsai 3ac95b53f4 Revert "Fix build error for sdk_gphone_x86_64-userdebug"
This reverts commit 6924b25729.

Reason for revert: with the following fix, this workaround is no longer needed.
  https://android-review.googlesource.com/c/platform/build/+/762663

Bug: 112322265
Change-Id: I07363f6a5aa1697b6f7702343f3120e1049f07d8
Test: build sdk_gphone_x86_64-userdebug
2018-10-04 04:35:55 +00:00
Anton Hansson 49b96de883 Merge "Add a few apps to mainline_system."
am: 65fd432a91

Change-Id: I58cd4eaa082c48ac56068ca9f2bf232b571f0648
2018-10-03 03:50:25 -07:00
Anton Hansson 65fd432a91 Merge "Add a few apps to mainline_system." 2018-10-03 10:32:57 +00:00
Jayant Chowdhary 3daa23eeb3 Merge "Reland "Add libbinderthreadstate to the VNDK."""
am: 8a8cf7b081

Change-Id: I736b2b798f8036b54580b7bbfa993bca9b8b3cd3
2018-10-02 13:57:09 -07: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 a88a8b6bb1 Merge "Add wrapped net utils to mainline_system."
am: 0820a93d69

Change-Id: I8eeabce2ced5b80205d02db366989650b1191bde
2018-10-01 10:31:42 -07:00
Anton Hansson 0820a93d69 Merge "Add wrapped net utils to mainline_system." 2018-10-01 17:22:05 +00:00
Anton Hansson 5c9730bcc3 Merge "Add bluetooth libraries to mainline_system."
am: e1d2c8d647

Change-Id: Ief3250f164bd57400fc6a0454eda3ab4745f50be
2018-10-01 04:13:58 -07: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 58577be60a Merge "Add the nfc_extras shared lib to mainline."
am: 60be6ae961

Change-Id: I23439ac16e7922942861743736797ed7cfe7a8ad
2018-10-01 02:57:14 -07: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 79fec85fde Merge "Add preopt scripts to mainline."
am: cae7ba396c

Change-Id: I5d51193d5135e3ffaf525547917376d2fa45a76c
2018-09-28 04:00:21 -07:00
Anton Hansson cae7ba396c Merge "Add preopt scripts to mainline." 2018-09-28 10:49:00 +00:00
Remi NGUYEN VAN 8654604f4b Merge "Revert "Add libbinderthreadstate to the VNDK.""
am: ebf81b36cf

Change-Id: Ia65b5fc949b046d66da7e437b32e482346a7faac
2018-09-28 02:59:32 -07: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
Wei Wang a595437a4b Merge "Added android.hardware.atrace 1.0 to VNDK"
am: cb1a99a676

Change-Id: Ic6549f55581fcf7d3af6fcb1b83dad5a3cccd552
2018-09-27 18:24:34 -07: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 79a216848b Merge "Add libbinderthreadstate to the VNDK."
am: 2f12a56593

Change-Id: I927a58e0867b47a04fb964a29812cd436e5b4154
2018-09-27 14:14:25 -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
Anton Hansson f6326846e2 Merge "Include AOSP telephony apps in mainline_system."
am: fb59f55487

Change-Id: I928d8c18382cf7c3da4f4200f14b95024b2cbe16
2018-09-27 03:07:16 -07:00
Anton Hansson f7ad92fde1 Merge "Fix vendor include in mainline_arm64."
am: b35140f666

Change-Id: I62ecf429b4ea037d78976f005cc1e5cd5bb68650
2018-09-27 03:06:37 -07: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 93d0e0d3c4 Merge "Add NeuralNetworks HAL v1.2 to VNDK"
am: 4da4d6cc89

Change-Id: I5511f827d6630cb7c48e6e607ed6d006bf8ed9e5
2018-09-24 05:44:09 -07:00
Przemyslaw Szczepaniak 4da4d6cc89 Merge "Add NeuralNetworks HAL v1.2 to VNDK" 2018-09-24 12:25:55 +00:00
Martijn Coenen 0fa999d51c Merge "Add keys for APEX images for eng/userdebug."
am: 6466b3a334

Change-Id: Ibd5efbb12e25309775d6c61bfba3a40d99667c24
2018-09-24 02:57:47 -07: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 09419ba860 Merge "Add recovery-persist to base_system"
am: 4b554bc436

Change-Id: Ic74ff159e437ab5d02d5a5f434fb44b9600800e5
2018-09-20 23:21:59 -07:00
yidong.zhang 62a5929b56 Merge "Enable TARGET_2ND_ARCH_VARIANT := armv7-a for vts build"
am: 993513a7d0

Change-Id: Ic3b9480cd54942a13c8918a66ec22b45db78ed05
2018-09-20 22:55:27 -07:00
Yifan Hong 0672b2222e Merge "health filesystem HAL renamed to health storage HAL"
am: 6a43200f89

Change-Id: If8b9dea76fdebb173cbe01a084080875b31a686b
2018-09-20 22:37:47 -07:00
Hung-ying Tyan 48d9f62e6c Merge changes from topic "vndk28"
am: 5bc52ac49f

Change-Id: I4b1acde427a78f9c49a6d9e5bb2ad6af245de9da
2018-09-20 22:36:57 -07:00
Treehugger Robot 4b554bc436 Merge "Add recovery-persist to base_system" 2018-09-20 21:26:53 +00:00
Treehugger Robot 993513a7d0 Merge "Enable TARGET_2ND_ARCH_VARIANT := armv7-a for vts build" 2018-09-20 21:04:23 +00: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
yidong.zhang f190daa19b Enable TARGET_2ND_ARCH_VARIANT := armv7-a for vts build
Vts release package is not compatible with cortext-a7(armv7-a) cores.
Build vts with TARGET_2ND_ARCH_VARIANT := armv7-a instead of armv8-a.

Bug: 116070933
Test: run vts -m VtsHalBaseV1_0TargetTest on cortext-a7 platform
Change-Id: I8089856223bac5129ad807496ad78b2cbfe1cc8a
2018-09-20 15:14:41 +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 329da43849 Merge "Revert "Add VNDK v28 to GSI from Android Q""
am: c70c69e740

Change-Id: Iabd2f1934aa3410f3cf4062e991c82ca8f41980e
2018-09-17 18:18:45 -07: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
SzuWei Lin dade85dd47 Merge "Add VNDK v28 to GSI from Android Q"
am: 5c3907f922

Change-Id: Ibcbfd59c0cecbfbed5fc3ac5e9f3dfac89bb72c8
2018-09-17 03:20:43 -07:00
Treehugger Robot 5c3907f922 Merge "Add VNDK v28 to GSI from Android Q" 2018-09-17 10:00:54 +00:00
Steven Moreland f484673f9e Merge "Remove HIDL libs from PRODUCT_BOOT_JARS."
am: 44199a57da

Change-Id: I4d32f0c8a836c57aef7fcc224a2cc4da6d3da621
2018-09-13 09:26:52 -07: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
Bowgo Tsai afb8caeadc Merge "Fix build error for sdk_gphone_x86_64-userdebug"
am: 8596dd8828

Change-Id: Id209bcb1c4f24419980fdbb7dbef6c3c423ce788
2018-09-11 07:42:22 -07:00
Bowgo Tsai 6924b25729 Fix build error for sdk_gphone_x86_64-userdebug
Increases BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE to 128MB to fix
the build break. This is because we enabled AVB signing in the following
CL. And verified boot metadata will consume the reserved size in current
build system.

  https://android-review.googlesource.com/c/platform/build/+/745691

Bug: None
Test: build sdk_gphone_x86_64-userdebug
Change-Id: If1f44dccbc3a69b1b38a23e979f50c2c52401a25
2018-09-11 19:23:14 +08:00
Bowgo Tsai 84452c6876 Merge "Enable AVB signing on GSI"
am: d9a58852bd

Change-Id: I16b4761de19f135265df4df5698f042ee8c47400
2018-09-10 23:37:17 -07:00
Treehugger Robot d9a58852bd Merge "Enable AVB signing on GSI" 2018-09-11 06:21:21 +00:00
Hridya Valsaraju e4f206e9ae Merge "Add fastboot HAL to VNDK"
am: 217f0defe9

Change-Id: Iea21c1ded8ec05a574d60cf0524eeb445c3e5747
2018-09-07 19:55:45 -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
Sundong Ahn dbda94f7b3 Merge "Rename to android.test.base.impl"
am: 7d1be8148e

Change-Id: I74755b144b194d1ae405faf306b5486399ca77fa
2018-09-06 18:44:46 -07:00
Treehugger Robot 7d1be8148e Merge "Rename to android.test.base.impl" 2018-09-07 01:01:59 +00:00
Bowgo Tsai 9d28638cfc Enable AVB signing on GSI
In current GSI builds, AVB signing is not allowed.
We should allow signing GSI image, while building a vbmeta.img with
AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED (flag 2).

When need to disable AVB, use the vbmeta.img above together with the
GSI. When need enable AVB on GSI, include the GSI public key into the
device-specific vbmeta.img. Note that GSI is a chain partition so the
keys used to sign GSI and vbmeta.img are different.

Bug: 112293933
Test: build aosp_arm64-userdebug, checks flag 2 is set in vbmeta.img
      and there is AVB HASHTREE in system.img
      `avbtool info_image --image $OUT/system.img`
      `avbtool info_image --image $OUT/vbmeta.img`

Change-Id: If1eff317621882994e7dcbf37cd35f5bfa16b69a
2018-09-06 09:41:42 +08:00
Steven Moreland ee8af2ca95 Merge "Install libbinder_ndk to the system."
am: 5fd1022106

Change-Id: Ie24f1f351f718308c60a1c6e5dcc71a8952fa15d
2018-09-05 18:31:42 -07: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
Tri Vo 3a43018e57 Merge "Add android.system.suspend@1.0-service to base_system.mk"
am: 647e32fa09

Change-Id: I72275cc502978789c533df6ccd8678fd436ecb40
2018-08-31 13:29:14 -07: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 0c5cc9e193 Merge "Add apexd to base_system."
am: 9e913d0fcf

Change-Id: I4280a7cd59935c5f099d23328810f90c9f3361c5
2018-08-27 10:37:07 -07:00
Martijn Coenen 9e913d0fcf Merge "Add apexd to base_system." 2018-08-27 17:24:11 +00:00
Anton Hansson 6cd4df1c5d Merge "Add OTA support to mainline_system."
am: 82182c8233

Change-Id: I5464e0370ca7f6db89f0853a72f31951e021328e
2018-08-22 12:03:40 -07: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 e94e9ead54 Merge "Install recovery etc files to recovery/root/system/etc."
am: c901630789

Change-Id: Iaa969ffce9fc42213ec641774170a1698e820777
2018-08-21 18:13:28 -07: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
Hridya Valsaraju 067c8911f2 Merge "Correct PRODUCT_USE_FASTBOOTD USAGE"
am: 6518cbdadf

Change-Id: I8256a91cc4103dfec9e9247d38c09e723ad1957b
2018-08-17 12:38:53 -07: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 fd2f9a0781 Merge "Remove obsolete wallpapers from core product mks."
am: a43576a0b8

Change-Id: I3027ff8c294231f25cadd52866f62feb312500b1
2018-08-16 00:21:22 -07:00
Anton Hansson d91a87d9d7 Merge "Add init_second_stage.recovery to base modules."
am: 3d128b88f0

Change-Id: I89d61021fc38684412b4ccc2bbb0e4cf54927523
2018-08-16 00:09:07 -07: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 ef813b772a Merge "Remove libsuspend from VNDK."
am: 0dd056538a

Change-Id: I79da3b322d08a6d98299b5ca6c3c37d7d797e4c2
2018-08-15 15:27:45 -07: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 1a78230723 Merge "Add android.system.suspend@1.0.so to VNDK-core"
am: b05a4f1ed3

Change-Id: I00d8139a5681d5c00fce6e39aa1eddd53fa0f349
2018-08-14 20:08:01 -07: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
Dan Willemsen 555904b0f3 Merge "Remove default BUILD_BROKEN_DUP_RULES := false"
am: aa47189e1c

Change-Id: Ib623fe24300b4310509f9b9d07aa26479226a8fe
2018-08-14 16:40:05 -07:00
Treehugger Robot aa47189e1c Merge "Remove default BUILD_BROKEN_DUP_RULES := false" 2018-08-14 23:32:20 +00:00
Steven Moreland 58ee295e26 Merge "Add power@1.3 to the VNDK."
am: 1c8485b713

Change-Id: I089dba6e14f6a2f5671a4152be58c26ee4e05c5f
2018-08-14 16:19:18 -07:00
Treehugger Robot 1c8485b713 Merge "Add power@1.3 to the VNDK." 2018-08-14 22:59:36 +00:00
Hridya Valsaraju a9d3d3a9c2 Merge "Add fastbootd to build targets"
am: c76b000acb

Change-Id: Ia6895921c28e05a3d8fe13ac8b6f37a02064d518
2018-08-14 15:54:33 -07:00
Yifan Hong ce916fb484 Merge "Add health HAL to recovery."
am: 4684cfbb32

Change-Id: Iba4ceb009774e1bf92270cc610f4198dae9e1cda
2018-08-14 15:52:13 -07:00
Colin Cross 232bc25b8a Merge "Remove TARGET_USES_MKE2FS"
am: de684e84fb

Change-Id: If2f3d4fba3e782d12962b2d99b3d6b709ff85b70
2018-08-14 15:51:33 -07: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
Colin Cross de684e84fb Merge "Remove TARGET_USES_MKE2FS" 2018-08-14 20:55:51 +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
Dan Willemsen d1f319bc48 Remove default BUILD_BROKEN_DUP_RULES := false
This is now false by default.

Bug: 77611511
Test: build_test on git_master
Change-Id: I37ad52a3846c77da184725e7d6f4daae9f4b7f1c
2018-08-14 13:23:49 -07:00
Jack Yu 2203edd897 Merge "Added IRadio 1.3 to VNDK"
am: 7f02e5961a

Change-Id: Ice43143f17f6669f9069be3f68b7885d136da149
2018-08-14 11:58:33 -07:00
Treehugger Robot 7f02e5961a Merge "Added IRadio 1.3 to VNDK" 2018-08-14 18:43:46 +00:00
Hridya Valsaraju 8cd64a3b5a Merge "Allow boot control HAL to be used in recovery"
am: 23d924aee3

Change-Id: Ib867e5ae226a5b0b5511efcd764371c8870608e4
2018-08-14 11:07:27 -07: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
Xin Li 23bc1e615d Merge "Merge stage-dr1-aosp-master into stage-aosp-master" into stage-aosp-master 2018-08-13 23:42:34 +00: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
Colin Cross a110579e31 Remove TARGET_USES_MKE2FS
Nothing reads TARGET_USES_MKE2FS any more, mke2fs is always used.
Remove the requirement that TARGET_USES_MKE2FS is set, and remove
the places it is set.

Bug: 112241651
Test: m checkbuild
Change-Id: Ibdca062bbe7dcd19ba8f7ee7f8291ce746b74e65
2018-08-13 17:40:26 +00:00
Hridya Valsaraju 91a7e3194b Add fastbootd to build targets
Bug: 78793464
Test: mmm
Change-Id: I0f7101d2ef948c522f8e4cfd51b91d33b59e1866
2018-08-13 10:16:27 -07:00
Steven Moreland 40ca9676df Merge "Add additional OWNERS for entries to the VNDK." am: 5b82034475
am: fab760e67a

Change-Id: I0cfa0c63ea7a76072c158adc5961a65e657d3a18
2018-08-10 17:27:47 -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
Yifan Hong 9bcc3561af Merge "Add health filesystem HAL to VNDK" am: b041d61e84
am: 9ca3670b42

Change-Id: Ie541b5f88c72d987fa00b8a9c4d46f015301dc98
2018-08-10 15:55:42 -07: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 6b0191df37 Merge "Revert "Whitelist system/lib64/libminadbd_services.so for recovery image."" am: 35edeae74f
am: bb4c888721

Change-Id: I09e1447665e6c97728e5311cb1c7738f32fe4a1c
2018-08-08 11:36:01 -07:00
Orion Hodson 5de8f78625 Merge "Enable dynamic image size for all generic devices" am: 9243997500
am: 0947f1cfe3

Change-Id: I3697ff0956e015aee67bd4fe94062fe54108b078
2018-08-08 11:20:12 -07:00
Tao Bao e5d61955e6 Merge "Whitelist system/lib64/libminadbd_services.so for recovery image." am: 5a851c6104
am: a15d71ae2c

Change-Id: Ia3e0df2fbc4c54274f74a5fcb8efba8bf4c552bd
2018-08-08 10:59:03 -07:00
Tom Cherry 77a294c2d0 Merge "Add more whitelisted artifacts for the recovery image" am: 6a99ae9099
am: cacda67169

Change-Id: I4e7300c7c0a8fc4d56c0f3356b2205ceb8bd3520
2018-08-08 10:29:19 -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
Isaac Chen e0feda17dc Merge "Revert "Revert "Build GSIs (aosp_$arch products) in sparse format""" am: 451fa13fa6
am: 3085fc0c05

Change-Id: I873482e8a707ae2930e12fb4a333dbef95812e0b
2018-08-06 13:18:12 -07:00
Isaac Chen 3085fc0c05 Merge "Revert "Revert "Build GSIs (aosp_$arch products) in sparse format"""
am: 451fa13fa6

Change-Id: I655794830ffc687c55f29d700368b9fc7074d23c
2018-08-06 12:10:14 -07:00
Treehugger Robot 451fa13fa6 Merge "Revert "Revert "Build GSIs (aosp_$arch products) in sparse format""" 2018-08-06 18:45:48 +00:00
TreeHugger Robot cccca824ef Merge "Enable dyanmic image size for GSI" into stage-dr1-aosp-master 2018-08-06 18:41:42 +00:00
Isaac Chen b9b51b1b73 Revert "Revert "Build GSIs (aosp_$arch products) in sparse format""
This reverts commit 132748cb80.

Reason for revert: The e2fsck issue, b/112062612, that caused the
revert of the original CL has been fixed in aosp/725259.

Change-Id: I5c919aedcc5b1c4823f565ea2bbe0e6ea81bc3b0
2018-08-06 02:48:28 +00:00
Tom Cherry f74fc758e4 Merge "Include watchdogd where init is included" am: 1a8473c8de
am: 75308bc5b9

Change-Id: Ic08f6c423910bfa8300e3baba3d39f28461a01b1
2018-08-03 12:46:56 -07:00
Tom Cherry 75308bc5b9 Merge "Include watchdogd where init is included"
am: 1a8473c8de

Change-Id: I3dac363bdf5f785e277c72f33cfca7a966b5b8f1
2018-08-03 12:37:58 -07:00
TreeHugger Robot baff15d43f Merge "Add emulator audio policy config in /vendor not /system" into stage-dr1-aosp-master 2018-08-03 17:52:51 +00:00
SzuWei Lin aadbd3084c 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
2018-08-03 06:57:19 +00: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
Colin Cross cf15d77bbd Merge "Revert "Build GSIs (aosp_$arch products) in sparse format"" am: a2b0e478d3
am: 9d2fe1b5c7

Change-Id: I57115c3462dad64acc10a95fe2204599d66dae91
2018-08-01 02:33:23 -07:00
Colin Cross 9d2fe1b5c7 Merge "Revert "Build GSIs (aosp_$arch products) in sparse format""
am: a2b0e478d3

Change-Id: Ia2191fd7e0653f7f634bf273667aecbdffa5635c
2018-08-01 02:29:23 -07:00
Colin Cross 132748cb80 Revert "Build GSIs (aosp_$arch products) in sparse format"
This reverts commit bc0248f211.

Reason for revert: Triggered preexisting issue with e2fsck and ASAN

Bug: 112062612
Change-Id: I7b52fe539252ab1bb7229d32accb7abd6417f470
2018-08-01 06:26:03 +00:00
Kevin Rocard f36085bff9 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
Bug: 111963599
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-01 04:22:50 +00:00
Steven Moreland 7311a8cefc Merge "Remove vr_hwc from GSI image." into stage-aosp-master
am: 611769263a

Change-Id: I3e416136157e77bac32bac3feab10bf5ba9b1d91
2018-07-31 09:46:58 -07:00
TreeHugger Robot 611769263a Merge "Remove vr_hwc from GSI image." into stage-aosp-master 2018-07-31 16:42:35 +00:00
Isaac Chen b2f34a44ac Merge "Build GSIs (aosp_$arch products) in sparse format" am: 44c61176e8
am: 442e2f4441

Change-Id: I7297b2bacf91db615c480e0de3c3edad0b3a0030
2018-07-31 09:09:41 -07:00
Isaac Chen 442e2f4441 Merge "Build GSIs (aosp_$arch products) in sparse format"
am: 44c61176e8

Change-Id: Icfb51956662a4dbca0f8cf37ea9e4ddc6fe1c214
2018-07-31 09:05:31 -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
Isaac Chen bc0248f211 Build GSIs (aosp_$arch products) in sparse format
After aosp/719235 is merged, mk_qemu_image.sh now accepts
images in both raw and sparse formats. So We can build GSIs
(system images of aosp_$arch products) in sparse format, which,
historically, is expected by users of GSIs.

Bug: 111775319
Test: The system images below are all in sparse format:
    $ lunch aosp_x86-userdebug; $m -j; emulator
    $ lunch aosp_x86_64-userdebug; $m -j; emulator
    $ lunch aosp_arm-userdebug; $m -j; emulator
    $ lunch aosp_arm64-userdebug; $m -j; emulator

Change-Id: I4cb8df0908c4618376117249b61c853fac947e47
2018-07-27 10:33:57 +08:00
SzuWei Lin 9f5ea99a34 Merge "Add A/B update to GSI" 2018-07-23 14:22:56 +00:00
SzuWei Lin 9295ccaef4 Merge "Add A/B update to GSI" into stage-aosp-master 2018-07-23 14:20:13 +00:00
TreeHugger Robot dcdc4d25ae Merge "Add A/B update to GSI" into stage-dr1-aosp-master 2018-07-23 10:00:35 +00:00
SzuWei Lin cc5a1aac0e 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-23 17:02:28 +08:00
SzuWei Lin db3d1712f5 resolve merge conflicts of 2927f2185c to stage-dr1-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I7812dcb06172fd0ca5caf38ad8ee616cf1936f43
2018-07-23 16:28:14 +08:00
SzuWei Lin 2927f2185c Merge "Move some BoardConfig settings from EmuCommon to GsiCommon"
am: bcc4081cd1

Change-Id: I456dde1025f2e61c3c9c463c38279aa0404d91ac
2018-07-23 00:35:49 -07:00
SzuWei Lin bcc4081cd1 Merge "Move some BoardConfig settings from EmuCommon to GsiCommon" 2018-07-23 07:28:10 +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 e4507d8579 Merge "Add a few unwinder tools to debug tools." am: ae08b51891
am: 175a63112a

Change-Id: I5e848bd5dbdb5247684b1120ca7e365231919517
2018-07-21 12:49:52 -07: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
SzuWei Lin e592c965ee Move some BoardConfig settings from EmuCommon to GsiCommon
Move the settings which effect the system image to the file
BoardConfigGsiCommon.mk

Bug: 80117040
Test: build aosp_arm64-userdebug and pass
Change-Id: I42b14a124992c21b2da0e9e6197b1c38c6e58ce3
Merged-In: I42b14a124992c21b2da0e9e6197b1c38c6e58ce3
2018-07-18 10:19:46 +00:00
Anton Hansson 491909560e Merge "Move dep on PRODUCT_COPY_FILES to main.mk" into stage-aosp-master
am: e640df81d2

Change-Id: I814d8ef1d8e21cf1d5f3f3cb04e954dca2622bbc
2018-07-18 02:56:40 -07:00
Anton Hansson e640df81d2 Merge "Move dep on PRODUCT_COPY_FILES to main.mk" into stage-aosp-master 2018-07-18 09:48:43 +00:00
Isaac Chen 7831ed6d31 Merge "Create extra symbolic links at root for arm64 GSI" am: 226dd71836
am: 19a41487e9

Change-Id: If4d98998ff1c40ab1564f5107aad9dd719246aa6
2018-07-16 21:16:04 -07:00
Isaac Chen 19a41487e9 Merge "Create extra symbolic links at root for arm64 GSI"
am: 226dd71836

Change-Id: I83fa295a8657ba93dd7e8e008e4c929499c0d1fd
2018-07-16 21:12:25 -07:00
Treehugger Robot 226dd71836 Merge "Create extra symbolic links at root for arm64 GSI" 2018-07-17 04:04:12 +00:00
Isaac Chen 50978e8640 Create extra symbolic links at root for arm64 GSI
Relevant firmware/SW components have been moved out of directories
under root, but not all references to them updated. For example,
/vendor/firmware_mnt won't be used by Android to load firmware.
So we still need these symlinks so the firmware/SW components can
be accesses.

These links should be removed after all references are updated.

Bug: 111287060
Test: $ lunch aosp_arm64-userdebug; m -j
      # Checked $OUT/root for the added links
Change-Id: Ia7915dbdeabdee7a5cf8851772e89f080b927c45
2018-07-17 10:10:31 +08: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 c2f864030f Merge "move device_manifest.xml to base_vendor.mk" am: bc15d75e5c
am: 8b55abd98f

Change-Id: Ia5b2e38820d6a909083312c9f4e611dc0778c36a
2018-07-12 21:33:41 -07: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 e2d6217e10 Fix inconsistency in base_vendor.mk
am: 45812e5dbe

Change-Id: Ieb0e61c4f86926f1567e933095cb3c15abb84dba
2018-07-12 12:26:37 -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
Anton Hansson 691e1d8261 Merge "Split generic_no_telephony in two." into stage-aosp-master
am: 2211b0b162

Change-Id: I71dbee4932cbfba88cf62b0d2f1d29b98d8cf6b7
2018-07-11 01:12:09 -07:00
Mathieu Chartier ccd16f7948 Merge "Move ro.config.low_ram back to being a vendor property" 2018-07-10 22:09:14 +00:00
Anton Hansson ced4252c07 Merge "Split core_minimal in two." into stage-aosp-master
am: f2525e2699

Change-Id: I529af950332a17c94f353256fd4ba1c5075435b9
2018-07-10 13:54:46 -07: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 127a523495 Merge "Make including missing modules an error." am: 65dc646c76
am: 0b14a57aaf

Change-Id: I0b21bc0aad7b3d4aab83d162d7adad1f507d3421
2018-07-09 23:41:39 -07: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 4c9283ea37 Merge "Move packages from base_system to base_vendor." into stage-aosp-master
am: 60389468a7

Change-Id: If883dd1fe873498b6cae5e2434152e306a05aa58
2018-07-09 23:09:16 -07:00
Anton Hansson dac368e6ed Merge "Remove redundant packages from core_minimal.mk" into stage-aosp-master
am: 0546208495

Change-Id: Ief4cb96eaefac5aa59730450014229c7f59f7d2e
2018-07-09 23:08:30 -07: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 b3a9f10050 Merge "Add logic to preopt both archs for SDK libs" am: f3c54cfa78
am: cab7408131

Change-Id: Ie3fba1a3c22ff45c748849d15f84c31cbbe7de26
2018-07-09 13:05:36 -07: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
Mathieu Chartier 502892a936 Add logic to preopt both archs for SDK libs
Update stale PRODUCT_SYSTEM_SERVER_JARS list since
com.android.location.provider was renamed to
com.android.location.provider.impl.

Added logic to preopt both archs for SDK libs that are also system
server JARS.

Bug: 110780021
Test: manual and verify speed compiled

(cherry picked from commit 4568c2d908)

Merged-In: I34e728444ffda6db3375b638028d54b6ab623209
Change-Id: If0cb68ba4808aa8716099c5447645f4baac63f30
2018-07-09 11:05:21 -07:00
Anton Hansson b07453509e Align base_system and core_minimal with internal.
Move a few things up from core_minimal.mk to base_system, and make
a few other editing tweaks in base_system, to align it more closely
with the internal version.

Test: make
Change-Id: I3d0fd22ea1cf94b0d28610cc15e23aca3ddd21c4
Merged-In: Iddffd6982df039f5daa8be345de338ba11c63c10
2018-07-09 15:32:16 +01:00
Anton Hansson e8d663cb58 Remove redundant packages from core_minimal.mk
These are all in base_system.mk

Bug: 80410283
Test: make
Change-Id: I8717f2d9de10cde44458029692b308017ee2164b
2018-07-09 14:05:47 +01:00
Anton Hansson 274a209c45 Remove redundant packages from core_minimal.mk
These are all in base_system.mk

Bug: 80410283
Test: make
Change-Id: I8717f2d9de10cde44458029692b308017ee2164b
Merged-In: I8717f2d9de10cde44458029692b308017ee2164b
2018-07-09 14:02:25 +01:00
Anton Hansson 1ebcbd51ee Make including missing modules an error.
Only enable it for the core build files rolling up to generic.mk
for now, and whitelist a couple of modules that are conditionally
defined.

Bug: 7456955
Bug: 80410283
Test: lunch generic; m
Test: lunch full; m
Change-Id: I5448769433d09eaf970c4231874ced3261a5c66b
2018-07-09 11:00:24 +01:00
SzuWei Lin 89cdf13dff Merge "Add USE_XML_AUDIO_POLICY_CONF to GSI" am: 88a60636b3
am: 808b06d658

Change-Id: If30117a53ed897c3a3f55718985ad9755882b4d5
2018-07-07 16:37:47 -07:00
SzuWei Lin 808b06d658 Merge "Add USE_XML_AUDIO_POLICY_CONF to GSI"
am: 88a60636b3

Change-Id: I4472c2d88202bd8a074373a8b1325e4d96efa6a8
2018-07-07 16:34:10 -07:00
Treehugger Robot 88a60636b3 Merge "Add USE_XML_AUDIO_POLICY_CONF to GSI" 2018-07-07 23:27:40 +00:00
Isaac Chen 9af10a31bf Enable PRODUCT_COMPATIBLE_PROPERTY for aosp_$arch
GSI Pi (for newly launched devices) need to enable this to pass
VtsTrebleSysProp.

Bug: 79395858
Test: Built aosp_{arm,arm64,x86,x86_64}. Check system/etc/prop.default
    and found "ro.actionable_compatible_property.enabled=true".
    aosp_x86(_64) could boot to home screen.

Change-Id: I04a4ff7c5feee7671d727c04c9d9657b63ec0912
Merged-In: I04a4ff7c5feee7671d727c04c9d9657b63ec0912
2018-07-06 13:41:08 +08:00
SzuWei Lin fa420b40c5 Add USE_XML_AUDIO_POLICY_CONF to GSI
USE_XML_AUDIO_POLICY_CONF is must for Treble device, so it is
also must on GSI. The settings is missed when creating GSI
aosp_$arch, add it back by this patch.

Bug: 110988359
Bug: 111053290
Test: build aosp_arm64 and build pass
Change-Id: I95f096e58350233fdcc8de115cc1691360070445
2018-07-06 13:22:35 +08:00
Isaac Chen 87399730de Merge "Refactor BoardConfig.mk for emulator products" 2018-07-06 02:08:35 +00:00
Anton Hansson a052867bfa Merge "Remove non-existing packages from common mks." into stage-aosp-master
am: 2dee452c92

Change-Id: I7a1505e93fe3d92556f1dae98ab1fa82e5063a67
2018-07-05 08:59:42 -07:00
Anton Hansson 159acd4e0a Remove non-existing packages from common mks.
These were found by comparing PRODUCT_PACKAGES to $(ALL_MODULES). It
will be made an error for the core makefiles to depend on non-existing
modules soon.

Bug: 7456955
Bug: 80410283
Test: make
Test: diff various products before and after
Change-Id: I5d8af175a48172e63926e68f39daad4508f37ccb
Merged-In: I5d8af175a48172e63926e68f39daad4508f37ccb
2018-07-05 13:39:27 +01:00
Anton Hansson 06a23f8414 Remove non-existing packages from common mks.
These were found by comparing PRODUCT_PACKAGES to $(ALL_MODULES). It
will be made an error for the core makefiles to depend on non-existing
modules soon.

Bug: 7456955
Bug: 80410283
Test: make
Test: diff various products before and after
Change-Id: I5d8af175a48172e63926e68f39daad4508f37ccb
2018-07-05 13:38:26 +01:00
Isaac Chen 55e1d01f92 Refactor BoardConfig.mk for emulator products
The majority of the contents in BoardConfig.mk of emulator products
are the same. The common part is factored out as EmuConfig.mk so it's
easier to maintain these closely related products going forward.

Bug: 80117040
Test: Following products have been built and booted to homescreen:
  $ lunch aosp_x86-userdebug; m -j; emulator
  $ lunch aosp_x86_64-userdebug; m -j; emulator

Change-Id: I5392e0e88865d4908906a67c29939c23af84baf0
Merged-In: I5392e0e88865d4908906a67c29939c23af84baf0
(cherry picked from commit 510b76d8ff)
2018-07-05 18:47:15 +08:00
Anton Hansson 80e0c328dd Merge "Remove libdownmix from core_minimal." into stage-aosp-master
am: 7789352e0b

Change-Id: I1fa67922d29a7ef3961e8ccb7dca89e9b21356bb
2018-07-05 01:25:06 -07:00
Anton Hansson 7789352e0b Merge "Remove libdownmix from core_minimal." into stage-aosp-master 2018-07-05 08:18:13 +00:00