Commit graph

4210 commits

Author SHA1 Message Date
Yifan Hong
c3a7595347 Add snapshotctl to base system
Test: build and check output
Bug: 135752105
Change-Id: I229fd03994e7145b9e05452c4d564379c53d8a61
2019-09-23 14:16:06 -07:00
Yo Chiang
beffdcee13 Merge "Move ro.com.android.dataroaming sysprop to aosp_product.mk" am: f129ffa044 am: a6da511f08 am: ad8c0af23d
am: a91f8768a1

Change-Id: Iba88199c154914dcec66f06697422b60f4479d1b
2019-09-23 06:32:42 -07:00
Yo Chiang
ad8c0af23d Merge "Move ro.com.android.dataroaming sysprop to aosp_product.mk" am: f129ffa044
am: a6da511f08

Change-Id: I42735a86550a4698a4232ca5b49ade43df8ab4e3
2019-09-23 06:20:41 -07:00
Yo Chiang
a6da511f08 Merge "Move ro.com.android.dataroaming sysprop to aosp_product.mk"
am: f129ffa044

Change-Id: I9b3a79c0c0fefe2635dd0f093d99fd78eb45072e
2019-09-23 06:14:38 -07:00
Treehugger Robot
f129ffa044 Merge "Move ro.com.android.dataroaming sysprop to aosp_product.mk" 2019-09-23 12:51:46 +00:00
Przemyslaw Szczepaniak
897a58bfc6 Merge "Remove android.hardware.neuralnetworks@1.X dependencies." am: 164745d245 am: 507d69df89 am: 3765e6830c
am: 77048a26dc

Change-Id: If7089e21fef0a4ba306bfbe3c531aa542c863783
2019-09-23 03:22:55 -07:00
Przemyslaw Szczepaniak
3765e6830c Merge "Remove android.hardware.neuralnetworks@1.X dependencies." am: 164745d245
am: 507d69df89

Change-Id: Idf83457d721a4155e07f0c8c58252e5b4c388b58
2019-09-23 03:08:47 -07:00
Przemyslaw Szczepaniak
507d69df89 Merge "Remove android.hardware.neuralnetworks@1.X dependencies."
am: 164745d245

Change-Id: I5aea99819536a7909a994d1127545ccb8369eed5
2019-09-23 03:02:24 -07:00
Przemyslaw Szczepaniak
164745d245 Merge "Remove android.hardware.neuralnetworks@1.X dependencies." 2019-09-23 09:46:01 +00:00
TreeHugger Robot
0621dfcb19 Merge "Phase out Legacy GSI and gsi_common.mk" 2019-09-23 09:30:22 +00:00
Mike Ma
19f9181e43 Merge "Removing IVrComposerClient 1.0 from vndk." am: e8e3b5f0ba am: 45ca999e3d am: 2b67aa8040
am: ddc93d7fb3

Change-Id: Ic5d225d1e19baa1cf073c56aae14501370d962ad
2019-09-20 08:35:06 -07:00
Mike Ma
2b67aa8040 Merge "Removing IVrComposerClient 1.0 from vndk." am: e8e3b5f0ba
am: 45ca999e3d

Change-Id: I744e6e4fea1046c9f8ead3a2d51bcf362267a5d0
2019-09-20 08:19:30 -07:00
Mike Ma
45ca999e3d Merge "Removing IVrComposerClient 1.0 from vndk."
am: e8e3b5f0ba

Change-Id: I4d233684e3fdb7d6b1bb1b0313a1ab3c16d264c4
2019-09-20 08:12:31 -07:00
Yo Chiang
fd59e543e8 Move ro.com.android.dataroaming sysprop to aosp_product.mk
aosp_${device}.mk all have this system property set inside
vendor/build.prop:
  ro.com.android.dataroaming=true

so move this common setting into aosp_product.mk

We don't move this to //device/google/${device}/device-${device}.mk
because this property is only used by AOSP builds, so it may cause
issues if we make it a common setting across all device builds.

Bug: 136525499
Bug: 135502030
Test: Compare $ANDROID_PRODUCT_OUT before and after this change
Change-Id: Idd9e235707d9a7fea28fa8c741ad1a4014f71c86
2019-09-20 12:04:03 +00:00
SzuWei Lin
48a0af51f2 Phase out Legacy GSI and gsi_common.mk
The Legacy GSI is used on O/O-MR1 devices.
Do not need to support anymore. Phase out it.

Bug: 135977699
Test: none
Change-Id: I48b563a3aceca3c926e744165eb1dd88eff7a3d2
2019-09-20 10:33:06 +08:00
Ahmed ElArabawy
f3c9757c75 Merge "Wifi: Build vndk Uprev Wifi HAL 1.4" 2019-09-19 21:16:00 +00:00
mamik
5980f173c4 Removing IVrComposerClient 1.0 from vndk.
Bug: 141255490
Test: Manual, test build on master.
Change-Id: I9b65203e0d067855db03bda4e1b08333c59a0b4d
2019-09-19 18:10:05 +00:00
Przemyslaw Szczepaniak
6cbaf66026 Remove android.hardware.neuralnetworks@1.X dependencies.
After moving NNAPI to an APEX, android.hardware.neuralnetworks@1.X
were added as explicit dependencies to enable NNAPI static tests
to run.

It's possible to make them included in NNAPI static tests as static
libraries, no point in keeping them here.

Bug: 139120468
Test: flashed crosshatch, NNAPI static tests
Change-Id: Ib7fb001cb76c9f36dc651f268c9acb7c7bb43a43
2019-09-19 17:43:06 +01:00
SzuWei Lin
6404ac6999 Merge "Revise aosp_x86_arm to inherit from mainline_system directly" am: 7be2b01f3c am: 22096814e3 am: a9ef5327b3
am: 3109b34c3f

Change-Id: I5dc2cabc0753a60dffea1691ee995742de25100d
2019-09-17 22:11:41 -07:00
SzuWei Lin
a9ef5327b3 Merge "Revise aosp_x86_arm to inherit from mainline_system directly" am: 7be2b01f3c
am: 22096814e3

Change-Id: I5761471c556cb41faa8c39ab3c76eab6853151fe
2019-09-17 21:59:38 -07:00
SzuWei Lin
22096814e3 Merge "Revise aosp_x86_arm to inherit from mainline_system directly"
am: 7be2b01f3c

Change-Id: I21626f8bfe8705a4486edf19ff3494dbbbf6db83
2019-09-17 21:53:02 -07:00
Treehugger Robot
7be2b01f3c Merge "Revise aosp_x86_arm to inherit from mainline_system directly" 2019-09-18 04:41:30 +00:00
Harpreet \"Eli\" Sangha
6ff2f795f1 Merge "Add CLI for Directly Invoking IDL APIs" am: ccbdb22fd4 am: 564e016e30 am: 91ca2da51d
am: 438bab96e3

Change-Id: I8fb4dee048faa67fe09985046131e50f0dae615c
2019-09-17 21:26:29 -07:00
Harpreet \"Eli\" Sangha
91ca2da51d Merge "Add CLI for Directly Invoking IDL APIs" am: ccbdb22fd4
am: 564e016e30

Change-Id: I0337a08d44cc0cfdfae87c2020141783872ceed1
2019-09-17 21:12:36 -07:00
Harpreet \"Eli\" Sangha
564e016e30 Merge "Add CLI for Directly Invoking IDL APIs"
am: ccbdb22fd4

Change-Id: I3466221032014a2903de7c4a6f241aae886ff5aa
2019-09-17 21:07:03 -07:00
Treehugger Robot
ccbdb22fd4 Merge "Add CLI for Directly Invoking IDL APIs" 2019-09-18 03:43:29 +00:00
SzuWei Lin
18ef515e58 Revise aosp_x86_arm to inherit from mainline_system directly
After applying the patch, the contents in system/product align
to the mainline_system/aosp_product.

aosp_x86_arm is not releaseded for GSI. The patch also inherits
from BoardConfigMainlineCommon.mk instead of
BoardConfigGsiCommon.mk. But keeps output system_ext and product
files to /system/system_ext/ and /system/product/.

Bug: 136616665
Test: Compare the product out folder with/without the patch
Change-Id: I2aefbd2d3e71e26219508e53161fa8a3cc2fd652
2019-09-18 02:11:39 +00:00
Colin Cross
7399296348 Merge "Remove protobuf vendorcompat from base_vendor.mk" am: 70ef3c1c9d am: c43f0bff6d am: 4f91766ca1
am: 15d4cf7103

Change-Id: Iac6d683bcfc51adeff656acf5077b03433002349
2019-09-17 15:36:02 -07:00
Colin Cross
4f91766ca1 Merge "Remove protobuf vendorcompat from base_vendor.mk" am: 70ef3c1c9d
am: c43f0bff6d

Change-Id: Ic67fe3363dd5081e4f122bff7befaddc5ca1f9c3
2019-09-17 15:10:11 -07:00
Colin Cross
c43f0bff6d Merge "Remove protobuf vendorcompat from base_vendor.mk"
am: 70ef3c1c9d

Change-Id: Iac8a423aa7b7fc2acecca0a651050d5f7ef67b15
2019-09-17 15:03:47 -07:00
Colin Cross
70ef3c1c9d Merge "Remove protobuf vendorcompat from base_vendor.mk" 2019-09-17 21:49:37 +00:00
Tao Bao
1c99f6f75b Merge "Also install verity_key to ramdisk for non-system-as-root target." am: e430f7652a am: 6f756187fa am: 2771540c04
am: bc40418472

Change-Id: I57792ef22a005389a3f222998aba3dbc986a298b
2019-09-17 12:02:18 -07:00
Tao Bao
2771540c04 Merge "Also install verity_key to ramdisk for non-system-as-root target." am: e430f7652a
am: 6f756187fa

Change-Id: Iede385e6e40a190a39bba193b151466a222a3db8
2019-09-17 11:48:34 -07:00
Tao Bao
6f756187fa Merge "Also install verity_key to ramdisk for non-system-as-root target."
am: e430f7652a

Change-Id: Ic001692c7cc750bca1e6f226937a874729c52c4a
2019-09-17 11:43:15 -07:00
Tao Bao
c99819311c Also install verity_key to ramdisk for non-system-as-root target.
The commit in d14b895665
(https://android-review.googlesource.com/c/platform/build/+/728287)
changed partition layout, to always build the root dir into system.img,
even for devices not using system-as-root (i.e. the ones with separate
boot ramdisk).

With the new layout, there will be two root dirs for non-system-as-root
targets during the boot. If such a device uses Verified Boot 1.0,
/verity_key needs to be available in both roots, to establish the chain
of trust.
 - bootloader uses the baked-in key to verify boot.img; it then loads
   the ramdisk from the verified boot.img
 - First stage init uses /verity_key (in ramdisk) to verify and mount
   system.img at /system, then chroot's to it
 - Second stage init uses /verity_key (in system.img) to verify and
   mount other partitions

This CL adds rules to additionally install verity_key into ramdisk for
such targets.

Bug: 139770257
Test: Set up a target to use non-system-as-root
      (BOARD_BUILD_SYSTEM_ROOT_IMAGE != true). `m dist`.
Test: Check that both ROOT/verity_key and BOOT/RAMDISK/verity_key exist
      in the built target_files.zip.
Test: Run validate_target_files to validate the above target_files.zip.
      $ validate_target_files \
          --verity_key_mincrypt /path/to/verity_key \
          target_files.zip
Test: Run sign_target_files_apks to sign the above target. Re-run
      validate_target_files on the signed target_files.zip.
Test: python -m unittest test_validate_target_files
Change-Id: Ibe7e771c8c376429add85851ac86055564765d3c
2019-09-17 08:53:16 -07:00
Colin Cross
5ae5da1345 Remove protobuf vendorcompat from base_vendor.mk
It has been added to the individual products that have prebuilts that
reference libprotobuf-cpp-full.so or libprotobuf-cpp-lite.so.

Bug: 117607748
Test: treehugger
Change-Id: I49b79bc0a0b154596158b66cfafebab451c90a95
2019-09-13 16:00:43 -07:00
Harpreet \"Eli\" Sangha
9b29b0cfcb Add CLI for Directly Invoking IDL APIs
Test: Build and Flash
Change-Id: I896423f884659b3081021abf243c63c8e17044df
Signed-off-by: Harpreet \"Eli\" Sangha <eliptus@google.com>
2019-09-13 16:41:40 +09:00
Raman Tenneti
fc8f7f9c87 Merge "Delete AOSP/Email app." am: 588d913afe am: d9f835bab8 am: 8f350b5df3
am: bab1bc2936

Change-Id: I30a0b6d6d7cc9181676bec508f1d3c99a9bf2495
2019-09-12 12:10:35 -07:00
Raman Tenneti
8f350b5df3 Merge "Delete AOSP/Email app." am: 588d913afe
am: d9f835bab8

Change-Id: I596367352a89ce8ac6e38d9896c030d3bdf09880
2019-09-12 11:49:36 -07:00
Raman Tenneti
d9f835bab8 Merge "Delete AOSP/Email app."
am: 588d913afe

Change-Id: I13659349026582f9bdc64e55852e20f0e4994c31
2019-09-12 11:42:47 -07:00
Ian Kasprzak
e01deffcf6 Merge "prepare cellbroadcastreceiver to be a mainline module" am: 68a6e704d6
am: 73de478268

Change-Id: I5e690abcbef100cefbd3fc94ab26329b787e72d9
2019-09-12 09:35:06 -07:00
Raman Tenneti
820f20e990 Delete AOSP/Email app.
BUG: 139497239

Test: Manual
$ make -j 40

Change-Id: I2a32694b899bc4f0a0ba36b152c06689427dabf4
2019-09-12 16:31:57 +00:00
Ian Kasprzak
73de478268 Merge "prepare cellbroadcastreceiver to be a mainline module"
am: 68a6e704d6

Change-Id: I518fb7701a8290fc77d21427604dbd10556c19d0
2019-09-12 09:27:23 -07:00
Ian Kasprzak
68a6e704d6 Merge "prepare cellbroadcastreceiver to be a mainline module" 2019-09-12 15:51:30 +00:00
Ahmed ElArabawy
235cad61ec Wifi: Build vndk Uprev Wifi HAL 1.4
Move Wifi HAL from 1.3 to 1.4

Bug: 138243400
Test: Build and wifi works
Change-Id: I6983a0eaacac8aec004254b0811330bb81e2c206
2019-09-11 22:16:09 +00:00
TreeHugger Robot
8806061821 Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master 2019-09-11 20:31:35 +00:00
Chen Xu
675b92638d prepare cellbroadcastreceiver to be a mainline module
1. prepare two build targets one for updatable module another
for the legacy platform module with diferent config
2. a new cellbroadcastpermissionconfig module to expose
a signature permission.
3. by default, the build include the legacy version.
Later we will switch to the updatable module after more validation
e.g, usre data migration due to uid change
4. for go devies, always include the platform cellbroadcast to
to avoid creating new process

Bug: 135956699
Test: unit test and test app
Change-Id: I4d757e27b1e36fbf4890d08afbd45a141bccfc7c
Merged-In: I4d757e27b1e36fbf4890d08afbd45a141bccfc7c
2019-09-11 13:13:05 -07:00
Colin Cross
aea2e2304b Merge changes from topic "protobuf-3.9.1" am: 64c50b353e
am: 3c562fa09d

Change-Id: I36a4673d53b46e24adf3fd9994dc46e877cd40fb
2019-09-11 12:04:40 -07:00
Colin Cross
64c50b353e Merge changes from topic "protobuf-3.9.1"
* changes:
  Keep proguard fields for lite runtime
  Install vendorcompat verison of protobuf
  Make javanano a plugin
2019-09-11 18:00:16 +00:00
Chen Xu
cd196c8b64 Merge "prepare cellbroadcastreceiver to be a mainline module" 2019-09-10 16:34:45 +00:00