Commit Graph

5917 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Treehugger Robot
565bb632c7 Merge "Revert "Remove ro.apex.updatable=false in GSI"" 2019-12-13 23:15:51 +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
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
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
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
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
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
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
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
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
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
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
Anton Hansson
2e36b2a95d Merge "Add sdkext module" am: 5685159a7c
am: c1bad39da1

Change-Id: I0c2b05729514bf8665954935e23f07f66bdf0028
2019-12-03 08:42:49 -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
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
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