Commit graph

4051 commits

Author SHA1 Message Date
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
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
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
d9f835bab8 Merge "Delete AOSP/Email app."
am: 588d913afe

Change-Id: I13659349026582f9bdc64e55852e20f0e4994c31
2019-09-12 11:42:47 -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
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
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
Bo Hu
5242dc18bf Merge "emulator: convert sdk_phone_x86 and 64 to CSI" 2019-09-10 03:02:12 +00:00
Jooyung Han
2359e05efb Merge "Skip *.libraries.txt when skipping current vndk" 2019-09-10 01:04:35 +00:00
Treehugger Robot
b1374c9262 Merge "Moving emulator-specific properties to /system_ext" 2019-09-09 02:33:19 +00:00
Jooyung Han
a3c987d7f3 Skip *.libraries.txt when skipping current vndk
When TARGET_SKIP_CURRENT_VNDK=true current vndk libs are not installed.
Related *.libraries.txt files also should not be installed.

Bug: 132140714
Bug: 137511540
Test: TARGET_SKIP_CURRENT_VNDK=true m systemimage # and, look into /system/etc
Change-Id: Ieea7444c359410dd9a14ac0dd369cae38d18b63a
2019-09-09 11:19:19 +09:00
Xin Li
abf6afdce6 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: Ib7d2f7c5a8aef5c6c3e8f74c6c32d5092f32a166
Merged-In: I6f788cb4c7328e4f2315e4f028e2dd53badeb6cd
2019-09-08 13:11:47 -07:00
bohu
a3daf2e27c emulator: convert sdk_phone_x86 and 64 to CSI
BUG: 134444564
Change-Id: I88a7bc9ac0eb7cd06cce1f10e6f55a3e4c2c27ea
2019-09-07 08:25:59 -07:00
Steven Moreland
ec57c7b4ea Merge "VNDK -= libhwbinder_noltopgo" 2019-09-06 17:59:21 +00:00
Colin Cross
4c71549763 Install vendorcompat verison of protobuf
Some prebuilt vendor modules contain references to
libprotobuf-cpp-*.so, but the interface is not stable.  Upgrading
protobuf would cause those modules to fail, so the vendor version
of the new protobuf library is renamed to libprotobuf-cpp-*-3.9.1.so.
Manually install old libprotobuf-cpp-*.so files to /vendor
to avoid breaking products that have prebuilts that reference them.

Once the new version of protobuf is in each product can be
inspected for references to libprotobuf-cpp-*.so on /vendor and
these packages can be included only on those devices that need
them.

Bug: 117607748
Test: m checkbuild
Change-Id: I8ac955eb703e3faf22ff930c59b30385f374ad0a
Merged-In: I8ac955eb703e3faf22ff930c59b30385f374ad0a
2019-09-05 14:42:14 -07:00
Steven Moreland
80c808fcaf VNDK -= libhwbinder_noltopgo
This library is being deleted. People who need symbols from this library
should use libhwbinder instead.

Bug: 135558503
Test: build only
Change-Id: I7dd343cf2b95047f9c22b39bbc5cd9fa98c6c0b3
2019-09-05 14:30:43 -07:00
Vic Yang
0408a6e182 Set TARGET_VNDK_USE_CORE_VARIANT for Go devices
Bug: 119423884
Test: Build a Go device, boot, and check ld.config.txt.
Change-Id: Id996b7b77991ee3db184c780f5822f231426f508
2019-09-05 11:09:25 -07:00
Xin Li
c271afebaa Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:35 +00:00
Bowgo Tsai
ac3c65b7bb Reland: Moving GSI-specific files to system_ext
Only common files can reside in system partition, other files
should be moved to the newly added system_ext partition.

Note that for GSI, it will be a single system.img that includes the
contents of product and system_ext partitions, under /system/product
and /system/system_ext, respectively. After moving skip_mount.cfg to
system_ext partition, it also needs a symlink file under system
partition:

  /system/etc/init/config -> /system/system_ext/etc/init/config

This allows Q-launched first-stage init (in /boot partition) continue
to use the same path when new GSI image is used.

Bug: 138281441
Test: build aosp_arm64-userdebug and boot it on crosshatch
Test: rm -rf out && build/soong/soong_ui.bash --make-mode \
      TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug droid
Change-Id: Iae9f5fb688f49497563864eb882d5f0ae33c744a
2019-09-05 17:11:07 +08:00
Ian Kasprzak
cba65a9c92 Revert "Moving GSI-specific files to system_ext"
This reverts commit 8ef0ffe7e8.

Reason for revert: b/140499897 - Breaking multiple builds across branches.
Test: Forrest - go/forrest_run/L78500000361846284

Change-Id: I618e0d051fdcd7a7afcc09408e20c53f38566e94
2019-09-05 01:03:17 +00:00
Bowgo Tsai
478bda0122 Merge "Moving GSI-specific files to system_ext"
am: a6c80c1117

Change-Id: Ibba7d959d3e8a3e2b97c9138d067f9b6d0593d60
2019-09-04 08:22:42 -07:00
Bowgo Tsai
f14ec6bfc3 Moving emulator-specific properties to /system_ext
We're now adding a core CSI system.img that is common across different
targets. So emulator-specific things should be moved to /system_ext.

Bug: 137711197
Test: build and checks those properties are in /system_ext/build.prop
Change-Id: I0f8afdeda77849b06842dd4f6cd04b7aab08ada4
2019-09-04 13:18:45 +00:00
Bowgo Tsai
8ef0ffe7e8 Moving GSI-specific files to system_ext
Only common files can reside in system partition, other files
should be moved to the newly added system_ext partition.

Note that for GSI, it will be a single system.img that includes the
contents of product and system_ext partitions, under /system/product
and /system/system_ext, respectively. After moving skip_mount.cfg to
system_ext partition, it also needs a symlink file under system
partition:

  /system/etc/init/config -> /system/system_ext/etc/init/config

This allows Q-launched first-stage init (in /boot partition) continue
to use the same path when new GSI image is used.

Bug: 138281441
Test: build aosp_arm64-userdebug and boot it on crosshatch
Change-Id: Ida7c2d1b0152c7ef77fa9aeb5d0766d17aec59c5
2019-09-04 14:54:53 +08:00
Bo Hu
75e29ad5d4 Merge "goldfish: support system_ext"
am: 9432b4d052

Change-Id: Iad5ff28eab7ac56a038e192c7aa0f5019e3428a2
2019-09-03 10:40:08 -07:00
bohu
11eadcc4ed goldfish: support system_ext
For sdk_phone_* targets only

Change-Id: I4109a923a53311d09bafc2a0f5a70b2af4509cc3
2019-09-03 07:53:27 -07:00
Martin Stjernholm
874894452f Add new ART APEX.
am: 1ebd568850

Change-Id: I6372bef9ffd3e0f50d6c0bd373b8838cffc58b3b
2019-09-02 03:43:33 -07:00
Martin Stjernholm
1ebd568850 Add new ART APEX.
Test: Build & boot
Bug: 135753770
Exempt-From-Owner-Approval: Approved internally
Change-Id: Iaf2ba03b4136482f7fc60d464d012014d58216bd
Merged-In: Iaf2ba03b4136482f7fc60d464d012014d58216bd
2019-08-30 17:47:30 +01:00
Juju Sung
dd173ae513 Merge "Remove extra brackets in vndk_packages collecting phase"
am: 8f4f97da3f

Change-Id: Ic9d43bf388799d22395a5cc3c3f9a78cfaf700d5
2019-08-29 23:09:44 -07:00
Juju Sung
3021218d2a Remove extra brackets in vndk_packages collecting phase
Built target with syntax error near unexpected token `llndk.libraries.txt'
Unpaired brackets makes syntax error in collecting vndk_packages.

Test: build&flashed
Bug: 140097958
Change-Id: I65683a1fc3e7d2f1c8e4eeb471b23620d48c7c41
2019-08-30 09:59:51 +09:00
Justin Yun
ebe02d5fef Merge "Add platform hidl interfaces to mainline_system"
am: 6ae3aacab5

Change-Id: I9f03d3bd011127fd80ca126533d5664ebfd68edf
2019-08-27 20:52:14 -07:00
Justin Yun
bfe4a1c096 Add platform hidl interfaces to mainline_system
Core variant of some hidl interfaces must be included in
mainline_system explicitly because they have dependency with external
modules.

Bug: 138284120
Test: build mainline_system_arm64
Change-Id: I1893bb807429dbcacac3db3dcab2a830456775ea
2019-08-28 03:31:48 +00:00
Xianyuan Jia
7e36d3d0b6 Merge "Add iperf3 to debug packages"
am: d1f4c15fd2

Change-Id: Ibdd41402fcbe9d96c9e38464eb25f06ce7490f2f
2019-08-27 16:48:10 -07:00
Treehugger Robot
d1f4c15fd2 Merge "Add iperf3 to debug packages" 2019-08-27 23:17:20 +00:00
Mathieu Chartier
066f23b78a Merge "Revamp nopreload configuration"
am: bca3111cfa

Change-Id: I7f37c8fe0d97d2b8af44a0b11340480c156d2ac2
2019-08-26 09:27:02 -07:00
Mathieu Chartier
bca3111cfa Merge "Revamp nopreload configuration" 2019-08-26 16:13:10 +00:00
Amy Zhang
2491b3ca91 Merge "Tuner Hal 1.0 to build Add Tuner Hal 1.0 entry to configure file for building Test: Manual bug: 135709729"
am: e7f5833792

Change-Id: I0ffa402138e9097f5b984d3358a318a8c7ee9e84
2019-08-23 21:17:27 -07:00
Mathieu Chartier
7aa4e8614a Revamp nopreload configuration
No longer speed compile, we will rely on JIT and compilation during
boot to ensure performance.

Removed system ROM instrumentations since this will be done
dynamically.

Fixed renamed profilebootclasspath property.

Test: lunch taimen_nopreload-userdebug
Exempt-From-Owner-Approval: cherry-pick
Bug: 139883463

(cherry picked from commit 6f8fda4937)

Merged-In: I97a3a25c3094f84e130e02692b02832795ee6ef1
Change-Id: Id3e9b30a60d00ad3593f1587aa4b04ef7afe1fec
2019-08-23 22:09:02 +00:00
Amy Zhang
e7f5833792 Merge "Tuner Hal 1.0 to build Add Tuner Hal 1.0 entry to configure file for building Test: Manual bug: 135709729" 2019-08-23 22:02:59 +00:00
Henry Fang
ab23894a4a Tuner Hal 1.0 to build
Add Tuner Hal 1.0 entry to configure file for building
Test: Manual
bug: 135709729

Change-Id: I6c8fa9382c64dc86f719fdfb17726fa694b6abb7
Merged-In: I6c8fa9382c64dc86f719fdfb17726fa694b6abb7
2019-08-23 00:47:54 +00:00
Xianyuan Jia
41862d9ba4 Add iperf3 to debug packages
Bug: 123261826
Test: manual build
Change-Id: Ia7639daccd8ec9e48dbc1e900669c821f73a8be7
2019-08-22 22:54:12 +00:00
Anton Hansson
ffdeeae450 Merge "Remove stale artifact whitelist entries" 2019-08-22 12:09:27 +00:00
Anton Hansson
1ce08094d3 Merge "Remove stale artifact whitelist entries" into stage-aosp-master 2019-08-22 10:59:22 +00:00