Commit Graph

5634 Commits

Author SHA1 Message Date
Treehugger Robot 7c18a37147 Merge "unbreak sdk_phone_x86 boot" 2019-12-26 15:51:49 +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
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
Mark Chien b516ddd539 Merge "[Tether16] Build Tethering package" 2019-12-20 13:43:46 +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
Nikita Ioffe 58fa00583c Merge "Add userspace_reboot.mk and include it in mainline_system.mk" 2019-12-19 23:44:06 +00: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
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
Kiyoung Kim b80f88f424 Merge "Do not include linkerconfig for recovery" 2019-12-18 00:55:03 +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
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
Treehugger Robot 2f4a8bb534 Merge "Revert "Revert "Remove ro.apex.updatable=false in GSI""" 2019-12-17 05:51:34 +00:00
Treehugger Robot de5b0d2a73 Merge "Define PRODUCT_SYSTEM_* props for mainline_system" 2019-12-17 04:57:10 +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
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 565bb632c7 Merge "Revert "Remove ro.apex.updatable=false in GSI"" 2019-12-13 23:15:51 +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
Yo Chiang 078b1598ff Merge "Add mainline_system_x86_64 product" 2019-12-13 05:22:15 +00:00
Treehugger Robot dad976ffcb Merge "Adding developer_gsi_keys.mk" 2019-12-13 03:13:02 +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
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
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
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 39048511c2 Merge "Remove ro.apex.updatable=false in GSI" 2019-12-06 03:49:01 +00:00
Jooyung Han 79961687db Merge "Move extra VNDKs to /system_ext" 2019-12-05 08:55:31 +00: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 78560b2049 Merge "base_system.mk: Align formatting for updatable boot jar variable" 2019-12-03 00:43:17 +00: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
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 bdb8b6cf20 Merge "Set up IRadioConfig 1.3" 2019-11-26 18:52:26 +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
Steven Moreland fcd0862632 Merge "vintf vibrator vndk" 2019-11-25 17:31:26 +00: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 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
evitayan 8ac6463155 Add ike.jar to bootclasspath to expose IKE API
IKE will be a mainline module. This commit adds ike.jar to
bootpathclass so that IKE API is accessible to apps.

Bug: 143983419
Test: make update-api && make
Change-Id: I1dbb249f3109f45ce32c34bcb398108d61bc06cc
2019-11-21 16:21:14 -08:00
Treehugger Robot 394d65b41e Merge "Add Keymaster 4.1" 2019-11-21 22:41:49 +00:00
evitayan 5bc08b7bdd Add com.android.ipsec APEX to base makefile
com.android.ipsec will be shipped as a mainline
module in APEX format

Bug: 143905344
Test: Built and installed apex on device
Change-Id: I70da069146e8d9a7be38ab603c6bdaa9d6d9ba84
2019-11-21 08:25:01 -08:00
Martin Stjernholm 675aa4b093 Merge "Reland "Add libdl_android as a bootstrap library"." 2019-11-21 16:17:42 +00:00
Justin Yun e58ffe4681 Inherit base system_ext.mk files for aosp targets
Make aosp targets inherit handheld_system_ext.mk and
telephony_system_ext.mk files.
Devices that have /system_ext or /system/system_ext must inherit any
of *_system_ext.mk files to install mandatory packages for system_ext
partition.

Bug: 144542478
Test: Build aosp targets
Change-Id: Ibdbf0000ac4aa98c8485d67827f52208f9a827c5
2019-11-20 22:58:42 +00:00