Commit graph

6414 commits

Author SHA1 Message Date
Ivailo Karamanolev
c3d4fa442a Merge "Update VNDK library list adding Lights AIDL HAL" 2020-01-23 16:05:06 +00:00
Inseob Kim
f0cec69de9 Implement BOARD_VNDK_VERSION
This allows BOARD_VNDK_VERSION to be set to old versions. With VNDK
snapshot and vendor snapshot installed, newer system and older vendor
image can be built in the same time.

Bug: 65377115
Test: 1) VNDK_SNAPSHOT_BUILD_ARTIFACTS=true m dist vndk vendor-snapshot
Test: 2) install snapshot under source tree
Test: 3) set BOARD_VNDK_VERSION and boot cuttlefish
Change-Id: Ic5fefc8bcb866584b27f021a429cb6670a2e3048
2020-01-23 12:52:25 +00:00
Hayden Gomes
f23361a77e Merge "Adding IAudioControl v2.0" 2020-01-23 07:17:26 +00:00
Jiyong Park
d918cadcc0 libprotobuf-cpp-lite is removed from VNDK.
It is demoted to vendor_available library. Therefore it will be
installed to /vendor/lib[64] instead of /system/lib[64]/vndk.

Bug: 147780271
Test: m
Merged-In: I40a94a3ecf55592b8e2f83f43070fa958c532cef
Change-Id: I40a94a3ecf55592b8e2f83f43070fa958c532cef
(cherry picked from commit 87889b0d4d)
2020-01-23 13:11:09 +09:00
Ilya Matyukhin
cb9426dfae Add biometrics.fingerprint@2.2 to gsi
Bug: 139317981
Test: make
Change-Id: Id8102e76862c6c166c5c8510b1543e162c3cbc0c
2020-01-23 03:38:07 +00:00
Ilya Matyukhin
e0dd6de784 Merge "Add biometrics.face@1.1 to gsi" 2020-01-23 03:37:17 +00:00
Jack Yu
d33e74f9e5 Merge "Add android.hardware.secure_element@1.2"
am: 4b26ce076a

Change-Id: Ia20f33520e6b5af467caf4a5f318269afcc42c0c
2020-01-22 19:21:48 -08:00
Treehugger Robot
4b26ce076a Merge "Add android.hardware.secure_element@1.2" 2020-01-23 02:00:02 +00:00
Hunter Knepshield
0096fece8b Update VNDK library list for IDumpstateDevice 1.1.
Bug: 143183758
Bug: 143184495
Test: make
Change-Id: I5a89afc0be91c1874ae38b6e00f8239c2cec71ab
Merged-In: I5a89afc0be91c1874ae38b6e00f8239c2cec71ab
(cherry picked from commit c6cd7f43d1)
2020-01-22 17:44:25 -08:00
Hayden Gomes
4ba41ba399 Adding IAudioControl v2.0
Bug: 148098383
Test: make
Change-Id: I0430515b062181391f3c27cefab937e1e74762cb
2020-01-23 00:16:17 +00:00
Ivailo Karamanolev
382d51575d Update VNDK library list adding Lights AIDL HAL
Test: manual; build succeeds after adding new HAL
Bug: 142230898
Change-Id: Ie1c9d9b4285dfeb1aefd33c51e85a74ee02744d8
2020-01-22 23:34:25 +01:00
David Su
835751e995 Move cacerts_wfa from system to Wifi APEX
This allows the WFA certificates to be updated
when needed.

Bug: 145199837
Test: atest android.security.cts.CertificateTest FrameworksWifiTests
Change-Id: Ic190ecfd496d80e09b43860abdf0e21a11f514f5
2020-01-22 14:07:56 -08:00
Hunter Knepshield
c6cd7f43d1 Update VNDK library list for IDumpstateDevice 1.1.
Bug: 143183758
Bug: 143184495
Test: make
Change-Id: I5a89afc0be91c1874ae38b6e00f8239c2cec71ab
2020-01-22 13:17:50 -08:00
Howard Yen
34f06cb9e6 Merge "USB: VNDK: Add USB Gadget V1.1 hal interface" 2020-01-22 20:56:43 +00:00
Ilya Matyukhin
1677505a8f Add biometrics.face@1.1 to gsi
Bug: 145027036
Test: make
Change-Id: Ica15f39a1ed93a0a160e5b569e7975d0a6a96be6
2020-01-22 10:49:48 -08:00
Sravan Kumar Reddy Kallu
cb8bfae1de Merge "Revert "product: Remove wifi-service off SystemServerClassPath"" 2020-01-22 01:32:15 +00:00
TreeHugger Robot
581bbc5e3a Merge "libprotobuf-cpp-lite is removed from VNDK." 2020-01-22 01:21:44 +00:00
Automerger Merge Worker
75d4bd3e9e Merge "Remove BUILT_VENDOR_MANIFEST variable." am: 4de0c0906d am: 031ba1bd6b am: 46c39c8f88
Change-Id: Ice08243cb34eef960a80a67cec14e3321b88a509
2020-01-21 22:43:16 +00:00
Sravan Kumar Reddy Kallu
0457d2f719 Revert "product: Remove wifi-service off SystemServerClassPath"
Revert submission 10103769-load_wifi_service_dynamically

Exempt-From-Owner-Approval: see go/perf-revert-first

Reason for revert: <Regression reported in b/148099857>

Reverted Changes:
I7b658cbfa: SystemServer: Dynamically load wifi-service
I93f2467d0: product: Remove wifi-service off SystemServerClass...

Change-Id: I83a2f93e351675eecc1e15ea1bfd9e1407e3f7cb
2020-01-21 22:31:00 +00:00
Yifan Hong
031ba1bd6b Merge "Remove BUILT_VENDOR_MANIFEST variable."
am: 4de0c0906d

Change-Id: I8fc4de1e1291c54e892cd8afbd4a8ca3a943661e
2020-01-21 14:17:47 -08:00
Yifan Hong
4de0c0906d Merge "Remove BUILT_VENDOR_MANIFEST variable." 2020-01-21 21:33:18 +00:00
Shuzhen Wang
f8b6d6b2f9 Add android.hardware.camera.provider@2.6
Test: Build
Bug: 119325027
Change-Id: Ic5c70f9277f9227f56d3924230b05cca42576d19
2020-01-21 08:06:28 -08:00
Jiyong Park
87889b0d4d libprotobuf-cpp-lite is removed from VNDK.
It is demoted to vendor_available library. Therefore it will be
installed to /vendor/lib[64] instead of /system/lib[64]/vndk.

Bug: 147780271
Test: m
Change-Id: I40a94a3ecf55592b8e2f83f43070fa958c532cef
2020-01-21 16:21:57 +09:00
TreeHugger Robot
d2c5b26a98 Merge "Move ExtServices in com.android.ext apex." 2020-01-20 16:52:26 +00:00
SzuWei Lin
283dc8ced5 Add Legacy GSI R
Legacy GSIs named with the suffix _ab, ex. aosp_arm64_ab.
It contain some backward-compatible configurations for
devices upgraded from O/O-MR1.

The patch also addes legacy_gsi_release.mk for the special
configuretions of Legacy GSI.

Bug: 144742991
Test: boot aosp_arm64_ab-userdebug on a walleye P (with SPL)
Test: boot aosp_arm64_ab-userdebug on a walleye Q (with SPL)
Change-Id: I61c9e74abcc921ab2cb50bf6f6dce1097a8d6c77
2020-01-20 17:49:45 +08:00
Automerger Merge Worker
6647814fa1 Merge "libprotobuf-cpp-full is removed from VNDK." am: 3cff56942a am: 930eb7458d am: 7534f04fce
Change-Id: I044575ef54cbe9d969c825122b4d454dbb295b48
2020-01-20 08:02:03 +00:00
Jiyong Park
930eb7458d Merge "libprotobuf-cpp-full is removed from VNDK."
am: 3cff56942a

Change-Id: Ib9dabfdd95b996c53d1dfc6bc64bf410c9ac0357
2020-01-19 23:37:09 -08:00
Treehugger Robot
3cff56942a Merge "libprotobuf-cpp-full is removed from VNDK." 2020-01-20 07:32:36 +00:00
TreeHugger Robot
cd05aaef2b Merge "product: Remove wifi-service off SystemServerClassPath" 2020-01-17 16:38:09 +00:00
Dario Freni
d0ca631432 Move ExtServices in com.android.ext apex.
Bug: 147674123
Test: built on aosp_taimen and verified package is available from the
apex.

Change-Id: I59c070cf9b4ea6afef590888849de96ead84fde2
2020-01-17 13:38:44 +00:00
Sundong Ahn
a18f974bd7 Add PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29
The PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29 is added. This value is base
module when shipping api level is less than or equal to 29.

Bug: 124531214
Test: m -j
Change-Id: I0f06b04cf4c824b9c975d9b84f4a0e8171acef75
2020-01-17 12:57:12 +09:00
Automerger Merge Worker
c6f5ae5140 Merge "Compare existing ABI dump list with LSDUMP_PATHS" am: 4367e6cc51 am: dfb5e28588 am: 5f6434790e
Change-Id: Ib2e288d0d234bb3cc07470b8ed2b52376f72fe2b
2020-01-17 03:45:32 +00:00
Automerger Merge Worker
dfb5e28588 Merge "Compare existing ABI dump list with LSDUMP_PATHS" am: 4367e6cc51
Change-Id: I3765bce4715449a9b7fc99e06275340c04ae0058
2020-01-17 03:23:04 +00:00
Hsin-Yi Chen
4367e6cc51 Merge "Compare existing ABI dump list with LSDUMP_PATHS" 2020-01-17 02:09:39 +00:00
TreeHugger Robot
e49a8dd2cc Merge "Add incident-helper-cmd build target" 2020-01-17 00:57:34 +00:00
Automerger Merge Worker
b165bab09b Merge "Add stable aidl power HAL" am: add214cdee am: 91e8905596 am: ce121b7a88
Change-Id: Ia357fdd22df3bf4d0003f2b0caa38cc4833a0f40
2020-01-16 23:09:09 +00:00
Xiangyu/Malcolm Chen
aca3495708 Merge "move telephony-framework from framework.jar" 2020-01-16 23:05:25 +00:00
Wei Wang
91e8905596 Merge "Add stable aidl power HAL"
am: add214cdee

Change-Id: I3d5351c0ef408b87f0a14d2cb989e40d97e5e2d5
2020-01-16 14:40:00 -08:00
Wei Wang
add214cdee Merge "Add stable aidl power HAL" 2020-01-16 22:35:42 +00:00
TreeHugger Robot
2f0743483b Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master 2020-01-16 18:29:25 +00:00
Jiyong Park
8da1b9add3 libprotobuf-cpp-full is removed from VNDK.
It is demoted to vendor_avaialble library. Therefore it will be
installed to /vendor/lib[64] instead of /system/lib[64]/vndk.

Bug: 147780271
Test: m
Change-Id: I9db6147d6e6005177660e56e3ee42475c103d198
2020-01-17 00:55:52 +09:00
Roshan Pius
bfa41eef33 product: Remove wifi-service off SystemServerClassPath
We can dynamically load it instead.

Bug: 147799672
Test: Device boots up & connects to wifi networks.
Change-Id: I93f2467d0a39719157dac92fd8ba108bb2bde470
2020-01-16 06:31:08 -08:00
TreeHugger Robot
1bf3835efd Merge "Allow adding framework and service java code into permission APEX." 2020-01-16 11:15:45 +00:00
Automerger Merge Worker
1df6d79a0b Merge "device_(manifest|matrix).xml -> vendor_*" am: 2e4f20f540 am: fe1bb53543 am: 9a33bc10bc
Change-Id: I355ece2b39df76de7b82ba65805ea7cf561b7f75
2020-01-16 04:32:31 +00:00
Automerger Merge Worker
9a33bc10bc Merge "device_(manifest|matrix).xml -> vendor_*" am: 2e4f20f540 am: fe1bb53543
Change-Id: I07c65054fe5a569b557b10fb885c0efe735841a3
2020-01-16 04:23:03 +00:00
Yifan Hong
2e4f20f540 Merge "device_(manifest|matrix).xml -> vendor_*" 2020-01-16 04:09:08 +00:00
Hsin-Yi Chen
62de555119 Compare existing ABI dump list with LSDUMP_PATHS
This commit fixes the check for redundant files in prebuilts/abi-dumps.
Some ABI dump file names are different from the module names. The list
of existing files should be compared with LSDUMP_PATHS which are the
files generated by soong.

This commit also adds the check for the files in
prebuilts/abi-dumps/platform.

Bug: 147409497
Test: make
Change-Id: If304afb116e9b5d3cb7ceaf74822d5a19ebe1a35
2020-01-16 10:46:30 +08:00
Xin Li
6764f473a5 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: I5adf4130f45200f3abfa2d65178a1640918e5a06
2020-01-15 15:56:28 -08:00
Automerger Merge Worker
9700c5ff3a Merge "Add Identity Credential 1.0" am: 4026911ba1 am: 04c33dab31 am: e192131331
Change-Id: I708ebc8092ecaa570a376a3a71ae8135bc52ffff
2020-01-15 23:43:10 +00:00
Automerger Merge Worker
e192131331 Merge "Add Identity Credential 1.0" am: 4026911ba1 am: 04c33dab31
Change-Id: I2bf40d3eb0d877009c63f3015aef67f6eeae1f09
2020-01-15 23:32:39 +00:00
Changyeon Jo
d8d5182b44 Merge "Update VNDK library list" 2020-01-15 19:54:37 +00:00
Chen Xu
b319487f06 move telephony-framework from framework.jar
add telephony-framework to boot class path

Bug: 140908357
Test: Build
Change-Id: I7ebec46ca8c3b02c76b7f9db51b5dbaea21eff6c
2020-01-15 11:30:47 -08:00
TreeHugger Robot
d47921f24b Merge "Remove PermissionController from base_system after moving into APEX." 2020-01-15 18:17:37 +00:00
Hai Zhang
463a093e5c Allow adding framework and service java code into permission APEX.
Bug: 136503238
Test: presubmit
Change-Id: Idef2216deae08c6e82f8f166a39cf179461f2668
2020-01-15 09:37:58 -08:00
TreeHugger Robot
a5c409bb75 Merge "Remove service-statsd off SystemServerClassPath" 2020-01-15 08:32:54 +00:00
Sasha Kuznetsov
18c9405106 Update current.txt with measurement_corrections 1.1
Test: manually injected dummy measurement corrections in
GnssLocationProvider and verified that cuttlefish implementation
properly recieved them below the HAL
Bug: 145963440
Change-Id: I23362781b5383847eadbdfc878951ab09f160e25
2020-01-14 15:18:11 -08:00
Yifan Hong
975474a5b8 Remove BUILT_VENDOR_MANIFEST variable.
This was used by BUILT_SYSTEM_MATRIX and BUILT_ASSEMBLED_VENDOR_MANIFEST, but they
are deleted now.

Test: builds
Change-Id: Ie7e242dce9c6511b90fcf06ae4b6926b230b9873
2020-01-14 14:25:38 -08:00
Yifan Hong
51be69f063 device_(manifest|matrix).xml -> vendor_*
Building device_manifest.xml or device_compatibility_matrix.xml only
builds vendor manifest / matrices, but not all device manifest /
matrices (e.g. vintf_fragments, ODM manifest, etc.). Make the name more
accurate.

Test: m check-vintf-all

Change-Id: Ib017507c421355263d53a9e5b357f169c77da36d
2020-01-14 14:24:51 -08:00
David Zeuthen
dcc85ca5dd Add Identity Credential 1.0
Bug: 111446262
Test: VtsHalIdentityCredentialTargetTest
Test: android.hardware.identity-support-lib-test
Test: CtsIdentityTestCases
Change-Id: I91bf3a0551c4c0358d5f0de066739dcc05de1642
2020-01-14 11:21:03 -05:00
Mike Ma
b42a2ccfac Add incident-helper-cmd build target
Add a Java binary util target incident-helper-cmd. See frameworks/base
addition (ag/10054587) for details.

Test: build
Bug: 146086597
Change-Id: Ifd202d8622e32fbd9644930cdae4d0546ce5d481
2020-01-13 15:19:46 -08:00
Haoxiang Li
63011c86e1 Update VNDK library list
Add the car display service HAL interface

Bug: 140395359
Test: (build) m -j
Change-Id: Id638b3305a5b133cd4edebec3e3ad445ef766749
Signed-off-by: Changyeon Jo <changyeon@google.com>
2020-01-12 16:33:51 -08:00
Wei Wang
6231592500 Add stable aidl power HAL
Test: build
Change-Id: Ia3edaf6df52d2725cd6c2d34e5985b1dc16e8f3c
2020-01-10 14:18:23 -08:00
Hai Zhang
15fd20f873 Remove PermissionController from base_system after moving into APEX.
Bug: 136503238
Test: m mts && mts-tradefed run mts-permission
Change-Id: Ic6194402adfa1d0b8bd55e337e3b573ea37f7fba
2020-01-09 12:39:30 -08:00
Automerger Merge Worker
3205b4807e Merge "Revert "unbreak sdk_phone_x86 boot"" am: c30b734f42 am: 30a5c0cf8b am: 63c8e0382e
Change-Id: I1e9aa93cd0df43def35ae05ce5b930838363d030
2020-01-09 17:53:03 +00:00
Automerger Merge Worker
63c8e0382e Merge "Revert "unbreak sdk_phone_x86 boot"" am: c30b734f42 am: 30a5c0cf8b
Change-Id: Icd73510d6e002622188788c68db527f08df7c42d
2020-01-09 17:32:00 +00:00
Bo Hu
c30b734f42 Merge "Revert "unbreak sdk_phone_x86 boot"" 2020-01-09 16:56:35 +00:00
Automerger Merge Worker
4b482e337e Merge "Update references to sdkext" am: b9e912dc9d am: 2bba9827af
Change-Id: I3716fa082509f3ee2a94c5a3ab3c78a444da0cd9
2020-01-09 09:19:39 +00:00
Tej Singh
300158adc2 Remove service-statsd off SystemServerClassPath
We can dynamically load it instead.

Test: boots
Bug: 146064616
Change-Id: Ifbd039e83d92e8c757427f7aebb8ed8af2151f93
2020-01-08 18:51:04 -08:00
Bo Hu
08a2677fe7 Revert "unbreak sdk_phone_x86 boot"
This reverts commit 70c96c7f11.

Reason for revert: root cause fixed

Bug: 146580512
Change-Id: I5d841637d5ca0ae8df8f5499a8b3f02488b4814e
2020-01-09 02:35:07 +00:00
Anton Hansson
ea711c2418 Update references to sdkext
The module is getting renamed to sdkextensions.

Bug: 137191822
Test: presubmit
Change-Id: I628fc555b82e9bd931c8f0cce2222b02efad6036
Merged-In: I628fc555b82e9bd931c8f0cce2222b02efad6036
(cherry picked from commit 37e998ac31)
2020-01-08 11:42:03 +00:00
Anton Hansson
37e998ac31 Update references to sdkext
The module is getting renamed to sdkextensions.

Bug: 137191822
Test: presubmit
Change-Id: I628fc555b82e9bd931c8f0cce2222b02efad6036
2020-01-08 09:51:31 +00:00
Automerger Merge Worker
950604f8da Merge "vibrator: use package as name" am: c8b0187c8b am: e819518de8
Change-Id: If810c6606b9e40150f74848874b01152addf7b73
2020-01-07 23:07:40 +00:00
Steven Moreland
c8b0187c8b Merge "vibrator: use package as name" 2020-01-07 22:43:01 +00:00
Steven Moreland
7f684a0029 Merge "*common: use package as name" 2020-01-07 21:49:22 +00:00
Automerger Merge Worker
9a0acae5e9 Merge "Revert submission 1182953-1576003954286-8455af5a" am: 42f2c761bf am: 7da11edb71
Change-Id: Ife36d7f71d16943e0044ab8e1155aeb74edfb6c6
2020-01-07 20:29:39 +00:00
Chen Xu
42f2c761bf Merge "Revert submission 1182953-1576003954286-8455af5a" 2020-01-07 19:29:08 +00:00
Automerger Merge Worker
f1b2cc97c1 Merge "Clean up TARGET_FLATTEN_APEX lines in mainline products" am: 3ac9a12f5f am: 2eee2cd593 am: ea31abaf4f
Change-Id: I3244cf6d14672bc9a83137e4938617dc26efb608
2020-01-07 09:33:22 +00:00
Automerger Merge Worker
ea31abaf4f Merge "Clean up TARGET_FLATTEN_APEX lines in mainline products" am: 3ac9a12f5f am: 2eee2cd593
Change-Id: I1a634deadbbad49cfabf4ead80c0f0581e34ce82
2020-01-07 09:17:41 +00:00
Yo Chiang
3ac9a12f5f Merge "Clean up TARGET_FLATTEN_APEX lines in mainline products" 2020-01-07 08:41:53 +00:00
Automerger Merge Worker
7f09658f7a Merge "Revert "Add boringssl_self_test to PRODUCT_PACKAGES"" am: ee83e2d2c8 am: 44e7c20968 am: a93eac7c3f
Change-Id: I8e583396287c1ed667d6c2d4edbefaa035c93d75
2020-01-07 04:31:19 +00:00
Automerger Merge Worker
a93eac7c3f Merge "Revert "Add boringssl_self_test to PRODUCT_PACKAGES"" am: ee83e2d2c8 am: 44e7c20968
Change-Id: I607fded6b55a3470fa705be224ffb19ef35d2380
2020-01-07 04:19:39 +00:00
Treehugger Robot
ee83e2d2c8 Merge "Revert "Add boringssl_self_test to PRODUCT_PACKAGES"" 2020-01-07 03:51:29 +00:00
Automerger Merge Worker
f7b9a2999b Merge "update-vndk-list.sh delinated with ticks in error" am: 0fe0eda502 am: 81e3cfa8a3 am: 4c5e852883
Change-Id: Id174b82e55f384b5e201fca7a726a3b3894674ad
2020-01-07 02:23:32 +00:00
Steven Moreland
f371b1886f Merge changes from topics "vintf-rebootescrow", "vintf-vibrator"
* changes:
  vibrator: use package as name
  rebootescrow: use package as name
2020-01-07 02:19:06 +00:00
Automerger Merge Worker
4c5e852883 Merge "update-vndk-list.sh delinated with ticks in error" am: 0fe0eda502 am: 81e3cfa8a3
Change-Id: I0b00593d9a43f21093cb41fe02af536b3c7ec17b
2020-01-07 02:07:59 +00:00
Steven Moreland
7e2ec0e5af update-vndk-list.sh delinated with ticks in error
People have asked me on several occassions how to fix this error. It's
somewhat confusing since scripts aren't usually on a path. However, in
this case, the script is added to the path on host. Hopefully, using
tick marks here will make that more clear.

Bug: N/A
Test: N/A
Change-Id: I8601a5a9eb348b2e358875b45eae57ec910c9a06
2020-01-06 15:05:07 -08:00
Steven Moreland
af96f5ff4e vibrator: use package as name
In order to provide a more descriptive name, and to be consistent
with HIDL, the stable AIDL package names are switching from
vintf-vibrator format to the package format
(android.hardware.vibrator).

Bug: N/A
Test: all build time
Change-Id: I382074d66b06669876d8f9fa4fc95b8a9c4dbf2a
Merged-In: I382074d66b06669876d8f9fa4fc95b8a9c4dbf2a
2020-01-06 14:08:00 -08:00
Steven Moreland
fd457e713d *common: use package as name
In order to provide a more descriptive name, and to be consistent
with HIDL, the stable AIDL package names are switching from
vintf-*common format to the package format
(android.hardware.*common).

Bug: N/A
Test: all build time
Change-Id: Iae0fc50e043afdfbde57bdffa9e2e8603ba1f228
2020-01-06 14:01:04 -08:00
Steven Moreland
a31e24a799 vibrator: use package as name
In order to provide a more descriptive name, and to be consistent
with HIDL, the stable AIDL package names are switching from
vintf-vibrator format to the package format
(android.hardware.vibrator).

Bug: N/A
Test: all build time
Change-Id: I382074d66b06669876d8f9fa4fc95b8a9c4dbf2a
2020-01-06 13:41:47 -08:00
Steven Moreland
458c3511a0 rebootescrow: use package as name
In order to provide a more descriptive name, and to be consistent
with HIDL, the stable AIDL package names are switching from
vintf-rebootescrow format to the package format
(android.hardware.rebootescrow).

Bug: N/A
Test: all build time
Change-Id: I6468651c86ee38939073dab0418b3633762a5a80
2020-01-06 13:22:06 -08:00
TreeHugger Robot
9011ec1627 Merge "Revert "Add libdepthphoto to mainline_system"" 2020-01-06 21:05:43 +00:00
TreeHugger Robot
6fc140d6c5 Merge "Update VNDK library list for occupant awareness." 2020-01-06 20:19:32 +00:00
Emilian Peev
23abbfeb4b Revert "Add libdepthphoto to mainline_system"
This reverts commit 55b9c1b651.

Reason for revert: "libdepthphoto" is no longer required or built
Bug: 132449311
Test: Successful build

Change-Id: Id2013f80dbc962f70ccb1b687c0dc18fef372348
2020-01-02 12:54:30 -08:00
Josh Gao
552b3f96b2 Add libfdtrack to base_system.
Bug: http://b/140703823
Test: manual
Change-Id: I6015946b85a4564b82eb57a0a0a9bb1e058b100a
2020-01-02 12:44:52 -08:00
Yo Chiang
4a5ff18a01 Clean up TARGET_FLATTEN_APEX lines in mainline products
Remove redundant TARGET_FLATTEN_APEX lines from mainline board configs.
Remove redundant "inherit updatable_apex.mk" lines from
mainline_system_$arch makefiles.
mainline_system.mk now always install APEX into /system partition.
Products who need flattened APEXes would have their flattened APEXes
installed into /system_ext.

Test: Build mainline_system_arm64 and validate noop
Change-Id: I9ee4af529a4bd554cb8707cfc260d6b912fd5fff
2019-12-30 16:19:28 +08:00
Jiyong Park
aeda4b267b Revert "Add boringssl_self_test to PRODUCT_PACKAGES"
This reverts commit ac4a35f017.

The change is not required because the conscrypt APEX now has
'boringssl_self_test' as its required modules.

Bug: 146549048
Test: m && device boots
2019-12-30 16:58:34 +09:00
Chen Xu
0d9f3cb2fb Merge "Revert submission 1182953-1576003954286-8455af5a" 2019-12-27 18:56:38 +00:00
Automerger Merge Worker
f037120754 Merge "Add Multidisplay App and so to whitelist" into qt-qpr1-dev am: dd82625f27
Change-Id: Ic853e3d5fd0e9f4725062995ce34b06feb09a8f2
2019-12-27 16:01:39 +00:00
Automerger Merge Worker
a8eab50647 Merge "Do not build ld.config.txt" am: f1ef5591f1 am: 63e1d4d899 am: 1785dcfe52
Change-Id: Ie53f50ad3ae9d4d00c7bbb0d86a459b5e8d9db60
2019-12-27 00:37:17 +00:00
Automerger Merge Worker
1785dcfe52 Merge "Do not build ld.config.txt" am: f1ef5591f1 am: 63e1d4d899
Change-Id: I1bb0689958d9af85e9b78a8c832f13887a889197
2019-12-27 00:25:03 +00:00
Kiyoung Kim
f1ef5591f1 Merge "Do not build ld.config.txt" 2019-12-27 00:08:06 +00:00
Jeff Davidson
4c443e1d4e Revert submission 1182953-1576003954286-8455af5a
Reason for revert: Crashes telephony process when saving XML config from carrier apps (b/146727232)
Reverted Changes:
Ieaeec41f1: Whitelist telephony-common, ims-common.
I5588f7615: Add telephony-common, ims-common to telephony apex...
I81e922c0d: Add telephony-common, ims-common to telephony apex...

Change-Id: Ia64b73682fcc77db63e220867c66c4319c417582
Merged-In: Ia64b73682fcc77db63e220867c66c4319c417582
2019-12-26 23:27:33 +00:00
Jeff Davidson
9ae31126ea Revert submission 1182953-1576003954286-8455af5a
Reason for revert: Crashes telephony process when saving XML config from carrier apps (b/146727232)
Reverted Changes:
Ieaeec41f1: Whitelist telephony-common, ims-common.
I5588f7615: Add telephony-common, ims-common to telephony apex...
I81e922c0d: Add telephony-common, ims-common to telephony apex...

Change-Id: Ia64b73682fcc77db63e220867c66c4319c417582
2019-12-26 15:19:11 -08:00
Automerger Merge Worker
72e79a2fe3 Merge "unbreak sdk_phone_x86 boot" am: 7c18a37147 am: d3e86cfd66 am: 541c3e98cf
Change-Id: I1bdd00e0f2bd0748668ecc7969c3a960ad0aa9d1
2019-12-26 16:30:09 +00:00
Automerger Merge Worker
541c3e98cf Merge "unbreak sdk_phone_x86 boot" am: 7c18a37147 am: d3e86cfd66
Change-Id: Ifca20d9e9d56b9dcda8e498f82cf50e04fb94823
2019-12-26 16:13:58 +00:00
Treehugger Robot
7c18a37147 Merge "unbreak sdk_phone_x86 boot" 2019-12-26 15:51:49 +00:00
TreeHugger Robot
e96be6bdd2 Merge "preinstalled-packages-platform for profiles" 2019-12-23 22:38:48 +00:00
Jiyong Park
70c96c7f11 unbreak sdk_phone_x86 boot
Bug: 146580512
Test: choosecombo 1 sdk_phone_x86 userdebug; m; emulator
Change-Id: I8227291c89e1cafc35e63eccd2f5ca34ecbd5434
2019-12-23 23:46:55 +09:00
Automerger Merge Worker
f175b63dfd Merge "Move group_system_ext and passwd_system_ext to base_system_ext.mk" am: 6e487404ed am: beb44e1d01 am: 2958b05847
Change-Id: I62d8237f2266eb6860121f66827d83a0b63b959a
2019-12-23 11:31:17 +00:00
Automerger Merge Worker
2958b05847 Merge "Move group_system_ext and passwd_system_ext to base_system_ext.mk" am: 6e487404ed am: beb44e1d01
Change-Id: I23460fe9675d3f92444135b39a46a34ebbe91f67
2019-12-23 11:17:35 +00:00
Justin Yun
cc1e4cfb6e Move group_system_ext and passwd_system_ext to base_system_ext.mk
As we have base_system_ext.mk for the packages in system_ext
partition, move the group and passwd files for system_ext partition
to base_system_ext.mk.

Bug: 141658360
Test: mainline checks pass
Change-Id: Iff50482b90ff9877a58c54c8149014e8c103a3c6
2019-12-23 10:31:54 +09:00
Automerger Merge Worker
1d3b5b73e4 Merge "[Tether16] Build Tethering package" am: b516ddd539 am: b1dd6eb60d
Change-Id: I0eb011e685fff2d479b26ab9524a2fb7afadb636
2019-12-20 14:00:26 +00:00
Mark Chien
b516ddd539 Merge "[Tether16] Build Tethering package" 2019-12-20 13:43:46 +00:00
Kiyoung Kim
63d6d96653 Do not build ld.config.txt
Remove ld.config.txt from build target as it will be replaced with
generated linker config.

Bug: 139638519
Test: m -j passed
Change-Id: Idc3742df74f27d71d7f65bd7f0f518b31ca7970c
2019-12-20 18:30:07 +09:00
Mark Chien
7719c44e01 Merge "[Tether16] Build Tethering package" 2019-12-20 05:04:07 +00:00
Automerger Merge Worker
fd81065839 Merge changes from topic "art_apex_available" am: 3977cb4f75 am: ca423af91d am: 6ae6a3e422
Change-Id: I62d7bfab99a34a97f5680e8c7509c6b553b695ac
2019-12-20 02:29:06 +00:00
Automerger Merge Worker
5c7abe72a8 Merge "Add userspace_reboot.mk and include it in mainline_system.mk" am: 58fa00583c am: e42f12a376 am: ff9ebf7705
Change-Id: I7d55b8aff3121f99243c400e45c516f3eed456fc
2019-12-20 02:27:48 +00:00
Automerger Merge Worker
6ae6a3e422 Merge changes from topic "art_apex_available" am: 3977cb4f75 am: ca423af91d
Change-Id: I17c9555073ddd043b16ec3f0b8dc01b6f8fd5d09
2019-12-20 01:43:05 +00:00
Treehugger Robot
3977cb4f75 Merge changes from topic "art_apex_available"
* changes:
  Add boringssl_self_test to PRODUCT_PACKAGES
  Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR
2019-12-20 01:17:43 +00:00
Huihong Luo
dd82625f27 Merge "Add Multidisplay App and so to whitelist" into qt-qpr1-dev 2019-12-20 00:29:14 +00:00
Automerger Merge Worker
ff9ebf7705 Merge "Add userspace_reboot.mk and include it in mainline_system.mk" am: 58fa00583c am: e42f12a376
Change-Id: I22eece89788abed73b3ee06f4766d42d23db0af5
2019-12-20 00:26:19 +00:00
Nikita Ioffe
58fa00583c Merge "Add userspace_reboot.mk and include it in mainline_system.mk" 2019-12-19 23:44:06 +00:00
Jeff Sharkey
fd70a07462 Move MediaStore.java inside APEX boundary.
Recent work has paved the way to get MediaStore.java building against
"core_platform", and this change is actually shifting MediaStore.java
inside the MediaProvider APEX boundary.

This involves defining a new "updatable-mediaprovider" library JAR
and ensuring that it's spliced into classpaths where needed to keep
everything building and working.

Note that the MediaProvider APK itself is still bundled, so we're
manually including the MediaStore.java when building that APK so that
we can continue referencing @hide symbols, but there's a STOPSHIP
comment to remove that once we get the APK building against
"system_current".

Bug: 144247087
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: I48595fec9ccaf8d30ee4fa7209acb3484eba5272
2019-12-19 22:16:06 +00:00
Bookatz
3c1f8dfd94 preinstalled-packages-platform for profiles
Wallpaper packages are not needed on profiles.
This cl unwhitelists them, so that these system packages will
not be pre-installed on profile users.

Bug: 134605778
Test: Confirmed that the xml files appeared on device and that the
packages were not preinstalled
Change-Id: I39f877590f9853ae3b9c7271947947f0424da3ae
2019-12-19 11:46:28 -08:00
Kathan Shukla
ca722e3e38 Update VNDK library list for occupant awareness.
Test: build test.
Change-Id: Ia3ba706661e4e6b18f9c999bc5cf083842a6b7ea
2019-12-19 09:51:35 -08:00
Jiyong Park
ac4a35f017 Add boringssl_self_test to PRODUCT_PACKAGES
boringssl_self_test is a required module of the conscrypt.jar.
Therefore, it was installed along with the conscrypt.jar. However,
conscrypt.jar is no longer available for the platform but only for the
conscrypt APEX. The problem here is that the conscrypt APEX having
conscrypt.jar doesn't carry its 'required' property. As a result,
boringssl_self_test is missing. This is b/146549048.

Until the bug is fixed, manually adding the test binary to
PRODUCT_PACKAGES to ensure that it is installed always.

Bug: 146549048
Test: m, device boots

Change-Id: I72dbc51c267f8d8683b70c07ae726c3a3eba0aea
2019-12-19 21:45:42 +09:00
TreeHugger Robot
89526d41c6 Merge "Support Resume on Reboot" 2019-12-18 21:32:44 +00:00
Nikita Ioffe
1d0f32f6a6 Add userspace_reboot.mk and include it in mainline_system.mk
The intention of userspace_reboot.mk is to provide a default
configuration (e.g. userspace reboot watchdog timeout) for devices that
are supporting userspace reboot feature. So far it only contains one
property that tells whenever device supports userspace reboot, more to
follow in separate CLs.

Test: flashed blueline, checked that property is set to true
Bug: 135984674
Change-Id: I32e6281ccc36236ec4fa5cde299753b6e0ece181
2019-12-18 13:33:27 +00:00
markchien
bf4be9b5b8 [Tether16] Build Tethering package
Create com.android.tethering apex to pack Tethering.apk and
framework-tethering.jar together.
For go devices, tethering would run in system server process by
InProcessTethering.apk

Bug: 144320246
Test: -build, boot
Change-Id: Id2d68117e99173682908168e99ee28670bd71871
Merged-In: Id2d68117e99173682908168e99ee28670bd71871
2019-12-18 13:05:30 +00:00
markchien
8c3ae62e12 [Tether16] Build Tethering package
Create com.android.tethering apex to pack Tethering.apk and
framework-tethering.jar together.
For go devices, tethering would run in system server process by
InProcessTethering.apk

Bug: 144320246
Test: -build, boot
Change-Id: Id2d68117e99173682908168e99ee28670bd71871
2019-12-18 20:49:46 +08:00
Songchun Fan
52371a2308 Merge "[incremental] add adb data loader into system image" 2019-12-18 02:20:33 +00:00
Automerger Merge Worker
9a64a3a6f5 Merge "Do not include linkerconfig for recovery" am: b80f88f424 am: 7fbd89d0de am: 91aaca279e
Change-Id: If4bd264273bb97ec6886d2ae5f25f2cf1818d6ef
2019-12-18 01:28:29 +00:00
Automerger Merge Worker
91aaca279e Merge "Do not include linkerconfig for recovery" am: b80f88f424 am: 7fbd89d0de
Change-Id: If98266257509dbaae2b2fb6ce51c37aa156fbf5a
2019-12-18 01:13:41 +00:00
Kiyoung Kim
b80f88f424 Merge "Do not include linkerconfig for recovery" 2019-12-18 00:55:03 +00:00
Songchun Fan
ebf5d56a48 [incremental] add adb data loader into system image
Test: builds
Change-Id: I26a4cc19b5227b9ee027cd35c6aa33e8d94a40ec
2019-12-17 15:48:34 -08:00
Automerger Merge Worker
3b9b4ffc95 Merge "Move CtsShim and CtsPrivShim APKs out of system." am: 20d1b7d966 am: 6b0308921b
Change-Id: If7799ae7bd9e6613b3ff5eb06801b7c31b17ff97
2019-12-17 20:19:49 +00:00
Alexander Dorokhine
a8bae14fce Add framework-appsearch apex on the classpath.
Test: presubmit
Bug: 146218515
Change-Id: If511234a958661e71fcfb50c28679f6ff91f3ad8
2019-12-17 10:44:27 -08:00
Dario Freni
d5ed6019c9 Move CtsShim and CtsPrivShim APKs out of system.
These packages are now available in the shim apex package, which is made
available in both flattened and unflattened apex configurations.

Bug: 138429615
Test: atest CtsPrivilegedUpdateTests CtsPermissionTestCases
CtsStagedInstallHostTestCases; (on both flattened and unflattened
configurations)
Merged-In: I03939f6c3e711d5887da201e32173f86a6b0289e
Change-Id: I03939f6c3e711d5887da201e32173f86a6b0289e
2019-12-17 13:47:17 +00:00
Dario Freni
c81d71ff67 Merge "Move CtsShim and CtsPrivShim APKs out of system." 2019-12-17 13:19:11 +00:00
Dario Freni
3e41a7f856 Move CtsShim and CtsPrivShim APKs out of system.
These packages are now available in the shim apex package, which is made
available in both flattened and unflattened apex configurations.

Bug: 138429615
Test: atest CtsPrivilegedUpdateTests CtsPermissionTestCases
CtsStagedInstallHostTestCases; (on both flattened and unflattened
configurations)
Exempt-From-Owner-Approval: approved in
https://android-review.googlesource.com/c/platform/build/+/1180943
Change-Id: I03939f6c3e711d5887da201e32173f86a6b0289e
2019-12-17 10:11:01 +00:00
TreeHugger Robot
de05e2718d Merge "Camera: add camera device @ 3.6" 2019-12-17 09:31:41 +00:00
Jack Yu
7f00905643 Add android.hardware.secure_element@1.2
Test: build pass
Bug: 142495673
Change-Id: I26e63a960afa721454aee9000d57655068b11a7f
2019-12-17 09:25:50 +00:00
David Su
d880e49d44 Merge changes from topics "framework-wifi-apex", "split-framework-wifi"
* changes:
  Move framework-wifi into the Wifi APEX
  Add framework-wifi to bootclasspath
2019-12-17 07:35:27 +00:00
Automerger Merge Worker
7aefdb1da1 Merge "Revert "Revert "Remove ro.apex.updatable=false in GSI""" am: 2f4a8bb534 am: 23886a3c4d am: 0c081b6d76
Change-Id: I5761a2cc1fe9b335d0eb80a52b4654fb1d2f68f1
2019-12-17 06:28:58 +00:00
Kiyoung Kim
2cf6c27240 Do not include linkerconfig for recovery
Linkerconfig should be built as static, but recovery does not have
enough space for static binary. As recovery linker configuration is
quite static and simple, this can be generated from build time. As a
first step linkerconfig binary should be removed from recovery.

Bug: 146384333
Test: m -j passed && crosshatch recovery worked with this change
Change-Id: Ie82da787424c5d1ddd2724808aa2323ea881f75b
2019-12-17 15:27:02 +09:00
Automerger Merge Worker
0c081b6d76 Merge "Revert "Revert "Remove ro.apex.updatable=false in GSI""" am: 2f4a8bb534 am: 23886a3c4d
Change-Id: I89e5e260944124823c3098ee42e693545c9c0aba
2019-12-17 06:14:22 +00:00
Treehugger Robot
2f4a8bb534 Merge "Revert "Revert "Remove ro.apex.updatable=false in GSI""" 2019-12-17 05:51:34 +00:00
Automerger Merge Worker
74f58f3dc0 Merge "Define PRODUCT_SYSTEM_* props for mainline_system" am: de5b0d2a73 am: 0ea258ae16 am: dd779885eb
Change-Id: I6c0d26587bc7268ff4c9d2f074df290ff3880357
2019-12-17 05:24:53 +00:00
Automerger Merge Worker
dd779885eb Merge "Define PRODUCT_SYSTEM_* props for mainline_system" am: de5b0d2a73 am: 0ea258ae16
Change-Id: I341b3baed1b0e97b1fdb8f924d290c500b19428a
2019-12-17 05:13:12 +00:00
Treehugger Robot
de5b0d2a73 Merge "Define PRODUCT_SYSTEM_* props for mainline_system" 2019-12-17 04:57:10 +00:00
Muhammad Qureshi
6c351681a6 Merge "Add framework-statsd.jar to jars list" 2019-12-16 20:46:57 +00:00
Kenny Root
785ab51913 Support Resume on Reboot
When an OTA is downloaded, the RecoverySystem can be triggered to store
the user's lock screen knowledge factor in a secure way using the
IRebootEscrow HAL. This will allow the credential encrypted (CE)
storage, keymaster credentials, and possibly others to be unlocked when
the device reboots after an OTA.

Bug: 63928581
Test: make
Change-Id: I6ae1d9e7cc3761fa8ddc02b64e357d08402f39e9
2019-12-16 09:28:50 -08:00
Lalit Maganti
ef70f3c92f Merge "build: enable Perfetto by default" 2019-12-16 16:41:49 +00:00
Automerger Merge Worker
ef4640cb48 Merge "Add com.android.cronet APEX and org.chromium.net.cronet to base_system." am: ced27c4c60 am: 132c0346e2 am: 423d1b9d7d
Change-Id: I13729fd18ec271739377ab3796a5b0ec66ab9cd8
2019-12-16 15:18:44 +00:00
Lalit Maganti
37b5bf8aea build: enable Perfetto by default
Perfetto has been enabled by default on Pixel devices since P and has
proved to be stable and helped find performance issues on both P and Q.

On R+, iorapd has a dependency on Perfetto and thus we need to be enabled
by default.

Note that CTS tests have ensured that any downstream consumers of Android
have not accidentally broken Perfetto in old releases so this should be
safe to introduce and maintain going forward.

The two daemons of Perfetto (traced and traced_probes) are located on the
/system partition so for consistency, we have chosen to also enable the
build property on the system partition.

Googlers can see the below link for more context and detailed info.

Change-Id: I00fa7d4c97eda4d0ab83520d0f428bca83707d8a
Context (Googlers only): go/perfetto-by-default
Bug: 137963570
Test: checking product/build.prop in Treehugger builds
2019-12-16 15:15:29 +00:00
Automerger Merge Worker
423d1b9d7d Merge "Add com.android.cronet APEX and org.chromium.net.cronet to base_system." am: ced27c4c60 am: 132c0346e2
Change-Id: Ib344bdc3dd9f3c1bd8816630adf16768ddc9bd12
2019-12-16 15:00:33 +00:00
Luke Huang
ced27c4c60 Merge "Add com.android.cronet APEX and org.chromium.net.cronet to base_system." 2019-12-16 14:39:02 +00:00
Luke Huang
723ff8274d Add com.android.cronet APEX and org.chromium.net.cronet to base_system.
com.android.cronet will be shipped as a mainline
module in APEX format.

org.chromium.net.cronet is a java_sdk_library used to provide
Cronet API to apps.

Bug: 139397529
Test: Built and installed apex on device
Change-Id: Icff7ded02e360f2df9dfe3ac7185cf7f0034d014
2019-12-16 20:57:05 +08:00
Yo Chiang
3bbbe2d5b9 Revert "Revert "Remove ro.apex.updatable=false in GSI""
This reverts commit c7f63dfeda.

Reason for revert: b/145963716

Change-Id: I0f6a9c26b342a27dfebc0494a255492c838c09f5
2019-12-16 08:38:59 +00:00
Bowgo Tsai
851f144d90 Adding developer_gsi_keys.mk
OEMs who are willing to support booting the public Developer-GSI
in locked state can add the following line into a device.mk to include
the corresponding public keys into their first-stage ramdisk.

   $(call inherit-product, $(SRC_TARGET_DIR)/product/developer_gsi_keys.mk)

Bug: 144399552
Test: make checks $OUT/ramdisk/avb/.
Change-Id: I8fdefa0fb26c2d385dda1f72503d12e6fc306694
Merged-In: I8fdefa0fb26c2d385dda1f72503d12e6fc306694
(cherry picked from commit 01c6f6f215)
2019-12-16 14:49:42 +08:00
Sungsoo Lim
96504cfeb5 Remove media command
Use media-session shell command instead.

Bug: 144453231
Test: manually
Change-Id: I69e877d25621d4f77f40a676d1511cbb9e6af83d
2019-12-16 11:17:26 +09:00
Yo Chiang
96949d3904 Define PRODUCT_SYSTEM_* props for mainline_system
These properties, namely:

- PRODUCT_SYSTEM_NAME
- PRODUCT_SYSTEM_BRAND
- PRODUCT_SYSTEM_MANUFACTURER
- PRODUCT_SYSTEM_MODEL
- PRODUCT_SYSTEM_DEVICE

propagate into /system/build.prop as ro.product.system.* and can
identify if the /system partition is mainline_system.
These don't modify other ro.product.* properties that are defined in
partitions other than /system.

Bug: 110206836
Bug: 146191296
Test: lunch mainline_system_arm64-userdebug; m
Test: lunch aosp_arm64-userdebug; m
Test: Two products must have same PRODUCT_SYSTEM_* props
Change-Id: I300579d555d269481635237fb02aab5db71a510d
2019-12-15 15:11:53 +00:00
TreeHugger Robot
5c0aa1b3ee Merge "Add vintf-common" 2019-12-15 08:40:32 +00:00
Pawin Vongmasa
d118131588 Add vintf-common
Test: Builds

Bug: 145839204
Change-Id: I9f28643d6fd70183f0d6778f0eb1290643400164
2019-12-14 01:50:19 -08:00
Automerger Merge Worker
5917af3f2a Merge "Revert "Remove ro.apex.updatable=false in GSI"" am: 565bb632c7 am: 6d349fe4cc am: 4f1b16f6aa
Change-Id: I9dc657daee47d7c89b763a8672d83fe5980def34
2019-12-14 00:21:27 +00:00
Automerger Merge Worker
4f1b16f6aa Merge "Revert "Remove ro.apex.updatable=false in GSI"" am: 565bb632c7 am: 6d349fe4cc
Change-Id: I0331be1cf5112d10a5defba3d138a0e99c35bbb9
2019-12-14 00:09:07 +00:00
Muhammad Qureshi
81be9fe8db Add framework-statsd.jar to jars list
Add framework-statsd.jar to product_boot_jars and product_updatable_boot_jars

Bug: 145923096
Test: m
Test: vendor/google/tools/flashall
Test: adb shell cmd stats print logs && adb logcat "*:S statsd:*"

Change-Id: I00e9cfa847554e745bd7c18dffda13e9f7ab4130
2019-12-13 16:02:49 -08:00
Treehugger Robot
565bb632c7 Merge "Revert "Remove ro.apex.updatable=false in GSI"" 2019-12-13 23:15:51 +00:00
Automerger Merge Worker
edf413c451 Merge changes from topic "gsi-with-flattened-apexes" am: b3bff1d203 am: 66ee21cedd am: 5feb2e79a3
Change-Id: I244be08d252e1da0eee055a451d748cf0cabca87
2019-12-13 22:13:49 +00:00
Automerger Merge Worker
5feb2e79a3 Merge changes from topic "gsi-with-flattened-apexes" am: b3bff1d203 am: 66ee21cedd
Change-Id: I5a1c446abab9e0e8dec7dca027bc757f8b34d14b
2019-12-13 21:56:16 +00:00
Treehugger Robot
b3bff1d203 Merge changes from topic "gsi-with-flattened-apexes"
* changes:
  Enable updatable-apex.mk for mainline_system
  Add PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES
2019-12-13 21:10:56 +00:00
TreeHugger Robot
7fdf27e437 Merge "Move service-statsd to updatable system server jar" 2019-12-13 19:48:39 +00:00
Automerger Merge Worker
3fd96b0078 Merge "Add mainline_system_x86_64 product" am: 078b1598ff am: c47de5cb83 am: 8afcfa3877
Change-Id: I4edfa098ba8ed707e04bab5d93e6b0fed8217a43
2019-12-13 06:43:17 +00:00
Automerger Merge Worker
8afcfa3877 Merge "Add mainline_system_x86_64 product" am: 078b1598ff am: c47de5cb83
Change-Id: Ic138d068d98da417b6bc808e579b5741307600c4
2019-12-13 06:25:03 +00:00
Yo Chiang
078b1598ff Merge "Add mainline_system_x86_64 product" 2019-12-13 05:22:15 +00:00
Automerger Merge Worker
2dd3133345 Merge "Adding developer_gsi_keys.mk" am: dad976ffcb am: c58307824a am: 6686dfe7d9
Change-Id: I9fa93c25a636e60304deeb9284fa4e908cd41adb
2019-12-13 03:59:54 +00:00
Automerger Merge Worker
6686dfe7d9 Merge "Adding developer_gsi_keys.mk" am: dad976ffcb am: c58307824a
Change-Id: Ic2d30adc0868990bce0d417d7c3557e5334ba7f5
2019-12-13 03:41:03 +00:00
Treehugger Robot
dad976ffcb Merge "Adding developer_gsi_keys.mk" 2019-12-13 03:13:02 +00:00
Automerger Merge Worker
b525412cc2 Merge "Add linkerconfig to recovery" am: 0542582560 am: 3701950613 am: b960782c52
Change-Id: I73bbd7ae770d51a75d3c63ed5877d00c4ad3c795
2019-12-13 02:38:23 +00:00
Automerger Merge Worker
b960782c52 Merge "Add linkerconfig to recovery" am: 0542582560 am: 3701950613
Change-Id: If0bf79bfe405a6db525fb9eb3de0bf44caad5b0b
2019-12-13 01:59:36 +00:00
Kiyoung Kim
0542582560 Merge "Add linkerconfig to recovery" 2019-12-13 01:09:58 +00:00
David Su
b6d5b76624 Move framework-wifi into the Wifi APEX
Bug: 140299412
Test: device boots up and connects to Wifi
Change-Id: I0ae9ed5a21232385394f2e21b81671997ac86d23
2019-12-12 15:31:56 -08:00
Tej Singh
e9403e4e79 Move service-statsd to updatable system server jar
This moves StatsCompanionService into the statsd apex.
service-statsd.jar is no longer installed to system/framework, and is
instead installed to
/apex/com.android.os.statsd/javalib/service-statsd.jar by moving it from
PRODUCT_SYSTEM_SERVER_JARS to PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS

Bug: 145923413
Test: make clean; make; vendor/google/tools/flashall and manual
inspection of jar locations
Test: made trivial update to SCS and bumped the version of the apex.
Then did: 1. make com.android.os.statsd 2. adb install
com.android.os.statsd 3. adb reboot. Verified that the change was
reflected via the apex update

Change-Id: Ia261ea79b2a46a4cc709e1b7dd072de15e17571e
2019-12-12 15:23:59 -08:00
David Su
3fd2c56e85 Add framework-wifi to bootclasspath
Now that framework-wifi is a separate jar from
framework-minus-apex, need to add it to the
bootclasspath separately.

Bug: 140299412
Test: devices boots up

Change-Id: I2929a133797b78f4546fbd1790e08d5019f73ee8
2019-12-12 14:03:01 -08:00
Nicholas Ambur
76211be490 Merge "Add SoundTrigger@2.3 to gsi" 2019-12-12 21:37:00 +00:00
Yin-Chia Yeh
dfc0f94a15 Camera: add camera device @ 3.6
Test: build pass
Bug: 135142453
Change-Id: I8eb843346f69b35e8bbd0b1a21990916a34fae58
2019-12-12 11:39:39 -08:00
Dario Freni
99f5e40137 Enable updatable-apex.mk for mainline_system
Test: presubmit passes
Bug: 145791146
Change-Id: I87fb58c4d8d3d02d46af467d62222782658e73dc
2019-12-12 17:21:17 +00:00
Bowgo Tsai
01c6f6f215 Adding developer_gsi_keys.mk
OEMs who are willing to support booting the public Developer-GSI
in locked state can add the following line into a device.mk to include
the corresponding public keys into their first-stage ramdisk.

   $(call inherit-product, $(SRC_TARGET_DIR)/product/developer_gsi_keys.mk)

Bug: 144399552
Test: make checks $OUT/ramdisk/avb/.
Change-Id: I8fdefa0fb26c2d385dda1f72503d12e6fc306694
2019-12-12 21:32:49 +08:00
Nicholas Ambur
7df7b8601b Add SoundTrigger@2.3 to gsi
Bug: 141929369
Test: build and verify that build includes soundtrigger@2.3
Change-Id: Ie0070feff43931d3f702d5a7732c78fa4623d3d2
2019-12-11 19:15:01 -08:00
Jooyung Han
9efe534ef1 Add PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES
For GSI targets, this variable is set true, and Soong will install both
"flattened" and "unflattened" APEXes together in /system_ext and /system
respectively.

Bug: 137802149
Test: lunch aosp_arm64-userdebug && m
  resulting apex images under /system/apex
  and flattened apexes under /system/system_ext/apex

Change-Id: Ib72d1b9dbd59727942da39323ee7e60ac6e14882
2019-12-12 02:04:43 +09:00
SzuWei Lin
c7f63dfeda Revert "Remove ro.apex.updatable=false in GSI"
This reverts commit d24bc21f06.

Reason for revert: Waiting relative feature done.

Change-Id: I455bcaaba567260197d8ebe88175a9d40fb49195
2019-12-11 07:07:46 +00:00
Automerger Merge Worker
ec95588134 Merge "Change all cf_common paths to cuttlefish paths" am: 3b500a7ec3 am: 85f60f8307
Change-Id: I18b7021f769b0adc775d622912aa773ff8874312
2019-12-11 04:22:02 +00:00
Howard Ro
756ba7dc52 Add statsd apex to base_system
Bug: 145960929
Test: atest statsd_e2e_tests --rebuild-module-info
Change-Id: I83476ea471abbf5803a1edc3cb717ee450e6e152
2019-12-10 19:06:45 -08:00
Ram Muthiah
36ade67c50 Merge "Change all cf_common paths to cuttlefish paths" 2019-12-11 02:41:45 +00:00
Ram Muthiah
ed9d7bf9e1 Change all cf_common paths to cuttlefish paths
Merging cuttlefish_common master into cuttlefish master

Bug: 143774116
Test: Treehugger
Exempt-From-Owner-Approval: cf-only change
Change-Id: I9911ba93e642ac1909be45334a5f45fc95a4ab48
Merged-In: I9911ba93e642ac1909be45334a5f45fc95a4ab48
2019-12-11 00:06:30 +00:00
Ram Muthiah
7a597f572b Change all cf_common paths to cuttlefish paths
Merging cuttlefish_common master into cuttlefish master

Bug: 143774116
Test: Treehugger
Change-Id: I9911ba93e642ac1909be45334a5f45fc95a4ab48
Exempt-From-Owner-Approval: cf-only change
2019-12-10 21:24:38 +00:00
Automerger Merge Worker
2f69bc4605 Merge "Add telephony-common, ims-common to telephony apex." am: 52df8f5154 am: 5d2a05f5a1 am: b5144d4c59
Change-Id: Iadb4874a5a812fb214506325d797354ad99818af
2019-12-10 19:10:43 +00:00
Ahmed ElArabawy
d6e05fe1d0 Merge "VDK: add android.hardware.wifi.hostapd@1.2.so" 2019-12-10 19:01:41 +00:00
Automerger Merge Worker
b5144d4c59 Merge "Add telephony-common, ims-common to telephony apex." am: 52df8f5154 am: 5d2a05f5a1
Change-Id: I1d718255fc30b255fc83ac79233ec440074084c4
2019-12-10 19:00:39 +00:00
Amit Mahajan
13bc18a3ec Add telephony-common, ims-common to telephony apex.
Test: basic telephony sanity
Test: m com.android.telephony && adb install com.android.telephony.apex
Bug: 145555313
Change-Id: I5588f7615c45aac00eb00f436e15e8a1746d9ac6
2019-12-09 14:07:05 -08:00
Amit Mahajan
eebe2d7cab Merge "Create telephony apex." am: 1b9fd38513 am: c1ddc3adbc
am: 69a527d108

Change-Id: I5c28225d61996cb719ae384d7b0828776e84f8d5
2019-12-09 11:03:09 -08:00
Amit Mahajan
69a527d108 Merge "Create telephony apex." am: 1b9fd38513
am: c1ddc3adbc

Change-Id: I27b705b64d3c455fe68f4fdf34c50b620d4b92f1
2019-12-09 11:00:58 -08:00
Kiyoung Kim
d7c866cd45 Add linkerconfig to recovery
Add linkerconfig to recovery so it can be executed to generate
ld.config.txt in recovery mode

Bug: 139638519
Test: Tested from crosshatch recovery
Change-Id: I8dd2a8833332c8e583632700d1ba46d9a3b1fc94
2019-12-09 14:59:15 +09:00
Jeff Sharkey
139a0c6e3d Merge "Structure MediaProvider as an APEX." 2019-12-08 21:20:33 +00:00
Jooyung Han
bd3322942c Merge "Remove ro.apex.updatable=false in GSI" am: 39048511c2 am: 14bfaec086
am: 9fff19978f

Change-Id: I762024b8a548543d238d5dddd2c4802e1d952a11
2019-12-06 01:07:43 -08:00
Jooyung Han
1b3db9f535 Merge "Move extra VNDKs to /system_ext" am: 79961687db am: 1fba30a983
am: c5d7892dcb

Change-Id: Id3fb396292d2c160325bdff3d3fedc590aa6e4ca
2019-12-06 00:04:25 -08:00
Amit Mahajan
8c7ca1bc05 Create telephony apex.
Initial version includes StkLib. Other components will be added in
subsequent CLs.

Test: m com.android.telephony && adb install com.android.telephony.apex
Bug: 145555313
Change-Id: Ifa38d36ba36dbfa613bff9ac168af82b7d6886ee
2019-12-05 23:38:50 -08:00
Jooyung Han
9fff19978f Merge "Remove ro.apex.updatable=false in GSI" am: 39048511c2
am: 14bfaec086

Change-Id: Ib67ba51e1daccca650ade0483ee4ea54357bbb0b
2019-12-05 20:03:31 -08:00
Jooyung Han
39048511c2 Merge "Remove ro.apex.updatable=false in GSI" 2019-12-06 03:49:01 +00:00
Jeff Sharkey
5a4593c9d7 Structure MediaProvider as an APEX.
Based on guidance from the Mainline team, we're placing the
MediaProvider APK inside a new APEX, as this will allow us to
move MediaStore.java inside the module boundary in a future CL.

As part of this restructuring, we need the pre-Mainline APK to
remain intact to preserve the user's media database.  There is
already logic in place from previous CLs that will migrate data
from the pre-Mainline to the post-Mainline world, including tests
to verify that the migration works.

Bug: 144247087
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: I571eccbb2950a7c518a682eae3350ba7ef9bd804
2019-12-05 10:08:56 -07:00
Jooyung Han
c5d7892dcb Merge "Move extra VNDKs to /system_ext" am: 79961687db
am: 1fba30a983

Change-Id: Ie8ad9ad0856f38ac35e2fbc21071ecb3cbdefb58
2019-12-05 01:09:34 -08:00
Jooyung Han
79961687db Merge "Move extra VNDKs to /system_ext" 2019-12-05 08:55:31 +00:00
Hangyu Kuang
bb131ec4ff MediaTranscodingService: Bring up the services.
Bug: 145233472
Test: Build and flash the phone. dumpsys to show the service up and
running.

Change-Id: I179bf6b5048261a843a5058058102ca51f496e2b
2019-12-05 02:23:31 +00:00
Yu-Han Yang
0903d11744 Merge "Add GNSS HAL v2.1 to vndk" 2019-12-04 00:52:24 +00:00
TreeHugger Robot
fa758bdc9f Merge "Add permission APEX to base_system." 2019-12-04 00:21:01 +00:00
Robert Shih
fe60bc708c Merge "gsi current.txt: add android.hardware.drm@1.3.so" 2019-12-03 17:33:03 +00:00
Automerger Merge Worker
8db9ab21dc Merge "Add sdkext module" am: 5685159a7c am: 2e36b2a95d
Change-Id: Iedbe3897736a7e9c7b29a2ceb5ae3e7bc020f0b6
2019-12-03 17:08:46 +00:00
Anton Hansson
2e36b2a95d Merge "Add sdkext module" am: 5685159a7c
am: c1bad39da1

Change-Id: I0c2b05729514bf8665954935e23f07f66bdf0028
2019-12-03 08:42:49 -08:00
lesl
e373b78fb1 VDK: add android.hardware.wifi.hostapd@1.2.so
Bug: 142752869
Test: update-vndk-list.sh and Manual Test

Change-Id: If0a38d00953ea7daaca3eb0f668a7fa8082e9502
2019-12-03 23:36:12 +08:00
Anton Hansson
c982aecdb1 Add sdkext module
Add the module to the build, and its jar to the bootclasspath.

Bug: 137191822
Test: m
Change-Id: I11700ac6da3fe031692b792d2975c5eec5414e09
2019-12-03 13:32:15 +00:00
Automerger Merge Worker
594da5d83a Merge "base_system.mk: Align formatting for updatable boot jar variable" am: 78560b2049 am: e2b081d273
Change-Id: Ieb877eb916152ce3df46ed7cca98af1c565ec899
2019-12-03 00:59:19 +00:00
Roshan Pius
e2b081d273 Merge "base_system.mk: Align formatting for updatable boot jar variable" am: 78560b2049
am: 41e679308d

Change-Id: I58fd0ced83422d4767f24e4c44f0f0b8107509ed
2019-12-02 16:50:04 -08:00
Roshan Pius
78560b2049 Merge "base_system.mk: Align formatting for updatable boot jar variable" 2019-12-03 00:43:17 +00:00
Hai Zhang
ec5ca71550 Add permission APEX to base_system.
Bug: 136503238
Test: atest --rebuild-module-info permission_e2e_tests
Change-Id: Id2a01c2c4660627380c6f2b39eef800683502837
2019-12-02 11:53:06 -08:00
Mark Chien
2fd7f8e202 Merge "[Tether08] build InProcessTethering package" am: 05c8db112a
am: d8c7549b22

Change-Id: I62ba4c5f16abd8db0228ac74f28cc8934a0216c0
2019-11-30 04:31:14 -08:00
Mark Chien
05c8db112a Merge "[Tether08] build InProcessTethering package" 2019-11-30 12:17:47 +00:00
markchien
ef83b80ec3 [Tether08] build InProcessTethering package
Build tethering package which is running the same process as system
server.
Since tethering still have some dependency with system server which
need to run in system server process(e.g. use LocalService), we
need to use InProcessTethering for all first. After cutting off
the dependency, Go devices would keep use "InProcessTethering" and
other non-Go devices would be switched to use "Tethering" package.

Bug: 136040414
Test: -build, flash, boot
Change-Id: I680273a3ee8fed3af843a829da17ca84b130f475
Merged-In: I680273a3ee8fed3af843a829da17ca84b130f475
2019-11-29 13:50:54 +00:00
markchien
1542743b88 [Tether08] build InProcessTethering package
Build tethering package which is running the same process as system
server.
Since tethering still have some dependency with system server which
need to run in system server process(e.g. use LocalService), we
need to use InProcessTethering for all first. After cutting off
the dependency, Go devices would keep use "InProcessTethering" and
other non-Go devices would be switched to use "Tethering" package.

Bug: 136040414
Test: -build, flash, boot
Change-Id: I680273a3ee8fed3af843a829da17ca84b130f475
2019-11-29 21:43:19 +08:00
Roshan Pius
626f6371dc base_system.mk: Align formatting for updatable boot jar variable
Migrate PRODUCT_UPDATABLE_BOOT_MODULES &
PRODUCT_UPDATABLE_BOOT_LOCATIONS to a new PRODUCT_UPDATABLE_BOOT_JARS.
This new variable uses the same format as
PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS, i.e <apex>:<jar> pair.

Test: Compiles & flashed device. Ensured that the bootclasspath & system_server class
paths remain the same.

Change-Id: I1cb26d5ec825cd1f5282a6e0255094ddf2fe046a
2019-11-28 12:59:08 +00:00
SzuWei Lin
d24bc21f06 Remove ro.apex.updatable=false in GSI
Originally, GSI forced disable APEX and always contains apex
packages in flattern format. This patch remove the enforcement,
and APEX updateble is enabled according to ro.apex.updatable in
vendor.

Bug: 145245545
Test: build aosp_arm64-userdebug, check the property in system
Change-Id: I9cc943d7b2a30d037a2c1c137dad1233c1e3f57e
2019-11-28 12:57:05 +08:00
Jooyung Han
fe15dd1eb7 Move extra VNDKs to /system_ext
Extra VNDKs are now installed under /system_ext in APEX format with
a phony target "vndk_apex_snapshot_package".

There are still files remained in /system/etc(*.libraries.<VER>.txt)
which are installed with "vndk_snapshot_packages".

These files are already packaged into VNDK APEXes, but linkerconfig and
libnativeloader still use them from /system/etc.(b/145184886)

Bug: 137802149
Test: lunch aosp_arm64
  && flash system.img on Q device
  && boot

Change-Id: I94c340d6f1c1af6ab1ae93c22b0a98fd4c10262e
2019-11-27 22:16:16 +09:00
Sarah Chin
c147f40b77 Merge "Set up IRadioConfig 1.3" am: bdb8b6cf20
am: dd02481cee

Change-Id: Ibcd2011a6cc83e4b8a2eaeb390073fafd5653f0d
2019-11-26 12:06:54 -08:00
Sarah Chin
bdb8b6cf20 Merge "Set up IRadioConfig 1.3" 2019-11-26 18:52:26 +00:00
Roshan Pius
8086a123c3 base_system.mk: Switch to wifi mainline apex
Also, explicitly include the cacerts_wfa in builds. This used to be
included via the "required" tag in wifi-service build rule. We probably don't
want to deliver CA certificates to OEM devices via mainline updates. So,
leaving it out of the wifi mainline module & explicitly including it in
the base makefile.

Bug: 144722612
Test: Device boots up & connects to wifi networks.
Change-Id: I3e4487f9fad765e442bf8335ec1f21de3a47674d
2019-11-26 07:13:36 -08:00
Roshan Pius
2cea7f9417 base_system.mk: Switch back to wifi-service.jar
Reason for revert: Wifi services no longer plan to be a separate
APK/process for mainline. Will instead become a jar loaded from Apex.

Bug: 144722612
Test: Device boots up & connects to wifi networks.
Change-Id: I80dd27aae3bb8de372c210d6d16adfcdd9458017
2019-11-25 20:56:54 -08:00
Robert Shih
3c4aa69885 gsi current.txt: add android.hardware.drm@1.3.so
Bug: 139134043
Test: build
Change-Id: Ifc37b7af4712fc768ed17b4af115868379a54039
2019-11-26 01:54:52 +00:00
Sarah Chin
86167418b7 Set up IRadioConfig 1.3
Test: build
Bug: 144101226
Change-Id: Ia5ca23e07eda0d4db8a8c701181c073745abb094
Merged-In: Ia5ca23e07eda0d4db8a8c701181c073745abb094
2019-11-25 16:26:18 -08:00
Sarah Chin
7e04417beb Merge "Set up IRadioConfig 1.3" 2019-11-25 23:58:49 +00:00
Steven Moreland
569f080bd4 Merge "vintf vibrator vndk" am: fcd0862632 am: 3c0a874fbf
am: aa614c7d59

Change-Id: Ieffdb06007e14ddcbb36370ed1e2bfdef18d0d19
2019-11-25 09:52:03 -08:00
Steven Moreland
aa614c7d59 Merge "vintf vibrator vndk" am: fcd0862632
am: 3c0a874fbf

Change-Id: Id482abff67c242852cf3904130ff2d14db568957
2019-11-25 09:46:05 -08:00
Steven Moreland
fcd0862632 Merge "vintf vibrator vndk" 2019-11-25 17:31:26 +00:00
Benedict Wong
1023921d76 Merge changes from topics "Create IPsec(IKE) APEX", "Expose IKE ID, TS & SaProposal" am: f81965bdc8 am: 97239f3c3e
am: 582fcc3ad2

Change-Id: Ifd4a1e7d3e387877cc81757417d6ef4154323bbf
2019-11-25 07:16:44 -08:00
Anton Hansson
c5ece221b2 Merge "Update references to service jars" 2019-11-25 13:15:57 +00:00
Benedict Wong
582fcc3ad2 Merge changes from topics "Create IPsec(IKE) APEX", "Expose IKE ID, TS & SaProposal" am: f81965bdc8
am: 97239f3c3e

Change-Id: Ia36051827a05e1fb09e4dcef7cf43953ceb24d1b
2019-11-22 20:18:30 -08:00
Benedict Wong
f81965bdc8 Merge changes from topics "Create IPsec(IKE) APEX", "Expose IKE ID, TS & SaProposal"
* changes:
  Add ike.jar to bootclasspath to expose IKE API
  Add com.android.ipsec APEX to base makefile
2019-11-23 03:45:53 +00:00
Roshan Pius
27367f05c2 Merge "base_system.mk: Support system_server jars from apexes" am: 9dda264619 am: 20cc65daed
am: b318e9931e

Change-Id: I6d005b66cfcae711d12a8facc95ccbcba9c81e6f
2019-11-22 19:21:07 -08:00
Roshan Pius
b318e9931e Merge "base_system.mk: Support system_server jars from apexes" am: 9dda264619
am: 20cc65daed

Change-Id: Ic97d9b992b06c6d0c34f21dd31e6783e1a06206d
2019-11-22 19:18:01 -08:00
Amit Mahajan
fd95b73781 Merge "Revert "Add TeleServiceLib along with TeleService to PRODUCT_PACKAGES."" 2019-11-23 01:33:18 +00:00
Amit Mahajan
be7f79e75f Revert "Add TeleServiceLib along with TeleService to PRODUCT_PACKAGES."
This reverts commit 49afe97130.

Reason for revert: TeleServiceLib compilation on eng builds goes on indefinitely.

Change-Id: I2ee127595f1f427e9cb92bc4affdabc94af772a0
2019-11-23 01:23:51 +00:00
Roshan Pius
d6e239fc35 base_system.mk: Support system_server jars from apexes
Allow system_server jars delivered via apex. Regular system_server
jars are located in /system/framework folder. But, jars delivered via
apex are mounted at /apex/<module_name>/javalib. Also, not all the
libraries in /apex/<module_name>/javalib will be a system_server jar,
so adding a mechanism to list out the jar file explicitly within the
apex module.

Bug: 144722612
Bug: 141785760
Test: Compiles (both with empty & non-empty PRODUCT_SYSTEM_SERVER_APEX_JARS
value set)

Change-Id: Ia181ab22fdf2da575bfd532c1cd90a2f54742528
2019-11-22 12:48:09 -08:00