Commit graph

55370 commits

Author SHA1 Message Date
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
Yi Kong
a0d2141f45 Merge "Add back the llvm-ar P flag"
am: 8206233e51

Change-Id: I6f788cb4c7328e4f2315e4f028e2dd53badeb6cd
2019-09-06 20:50:42 -07:00
Yi Kong
8206233e51 Merge "Add back the llvm-ar P flag" 2019-09-07 03:41:42 +00:00
bohu
9d269381f3 Merge "Update generic_x86_arm for native bridge support"
am: 8b468c14ab

Change-Id: I58618475ef4d84b9868a769f6acf9a1d7086843e
2019-09-06 19:09:30 -07:00
Treehugger Robot
8b468c14ab Merge "Update generic_x86_arm for native bridge support" 2019-09-07 01:43:50 +00:00
Yi Kong
6c5e504c26 Add back the llvm-ar P flag
The P flag is supported as of llvm r354044, add back the flag to reduce
the size of intermediate archieve files. This does not affect the final
binaries.

Test: build
Bug: 71618641
Change-Id: I4021aec783ba341768893392b73b976c1fa5bdf7
2019-09-06 15:19:59 -07:00
Elliott Hughes
6fba8c3926 Merge "Remove unused $MD5SUM."
am: 6b5481fa5e

Change-Id: I6f21dd2e5e84bb166dc484fd258140a54d81ffb3
2019-09-06 14:55:10 -07:00
Elliott Hughes
6b5481fa5e Merge "Remove unused $MD5SUM." 2019-09-06 21:39:15 +00:00
bohu
05f73f0b19 Update generic_x86_arm for native bridge support
BUG: 140623928
Change-Id: I5ea205576393f66421b4edea192d1de9f3249c06
2019-09-06 14:37:17 -07:00
Steven Moreland
b34e5ed351 Merge "VNDK -= libhwbinder_noltopgo"
am: ec57c7b4ea

Change-Id: I12fc619392b2a1d81d1d81cfa0e0d6b5613b006c
2019-09-06 11:13:43 -07:00
Elliott Hughes
5602110d73 Remove unused $MD5SUM.
Test: treehugger
Change-Id: I63273b1602362a84beaf32d2260a0a4e35e6ef4d
2019-09-06 11:02:08 -07:00
Vic Yang
2e9839d040 Merge "Set TARGET_VNDK_USE_CORE_VARIANT for Go devices"
am: 63696709ba

Change-Id: Ia13ae9b7d470a304d118d02f865511eec9c86b25
2019-09-06 10:59:30 -07:00
Steven Moreland
ec57c7b4ea Merge "VNDK -= libhwbinder_noltopgo" 2019-09-06 17:59:21 +00:00
Vic Yang
63696709ba Merge "Set TARGET_VNDK_USE_CORE_VARIANT for Go devices" 2019-09-06 17:39:40 +00:00
Colin Cross
26296995af Merge "Dist proguard dictionaries for platform builds"
am: c2ecd76a0b

Change-Id: I7fd335d9393b5155aa53f5b8843cdb63226bab1d
2019-09-06 09:23:30 -07:00
Treehugger Robot
c2ecd76a0b Merge "Dist proguard dictionaries for platform builds" 2019-09-06 15:53:19 +00:00
Colin Cross
6676057eec Merge "Support injecting boringssl hash in Make"
am: 354dcef215

Change-Id: I78f374cf2720b77e9984ccc0298b21de06244092
2019-09-05 21:31:18 -07:00
Colin Cross
354dcef215 Merge "Support injecting boringssl hash in Make" 2019-09-06 04:16:11 +00:00
Colin Cross
114e8dfa3e Dist proguard dictionaries for platform builds
Proguard dictionaries are useful for platform builds as well as
unbundled builds, produce them for both.

Bug: 140585949
Test: m out/target/product/$(get_build_var TARGET_DEVICE)/${TARGET_PRODUCT}-proguard-dict-eng.ccross.zip
Change-Id: I63b826be35cfbfc9661b5be7de5bea285bd3d3fc
2019-09-05 21:08:38 -07:00
Elliott Hughes
7fde0b2e81 Merge "Switch to toybox stat on macOS too."
am: fdef43d69c

Change-Id: I8f93a2c33a0c0e607f489a70672e8a00a7f5af73
2019-09-05 16:42:06 -07:00
Colin Cross
70bfe07e6c Support injecting boringssl hash in Make
Add LOCAL_INJECT_BSSL_HASH for the two modules in Make that
statically link libcrypto.

Bug: 137267623
Test: m checkbuild
Change-Id: I5d21c262ff388aeb2dbd02595706c5531a628b7e
2019-09-05 15:31:31 -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
Elliott Hughes
fdef43d69c Merge "Switch to toybox stat on macOS too." 2019-09-05 21:02:06 +00:00
Xin Li
65a5523790 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
am: c271afebaa -s ours
am skip reason: subject contains skip directive

Change-Id: I67f908997d20462521538a58dd91d4432d0dcbf8
2019-09-05 13:55:32 -07:00
Xin Li
08657f02b4 [automerger skipped] DO NOT MERGE - Merge Android 10 into master
am: 7a05ffb25c -s ours
am skip reason: subject contains skip directive

Change-Id: I389e2d12f62e107f2f91b4134b9da5a3e83ca083
2019-09-05 13:26:20 -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
Elliott Hughes
2e51a1553f Switch to toybox stat on macOS too.
Bug: http://b/139450866
Test: builds
Change-Id: I1a992a63fbf5181a48262901730b8b67661cc259
2019-09-05 10:02:41 -07:00
Xin Li
c271afebaa Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:35 +00:00
Bowgo Tsai
ab38d47d5a Merge "Reland: Moving GSI-specific files to system_ext"
am: 2fc007eba5

Change-Id: I2fae8961887e6fa0e9a8d3815e953a6f687fb2a8
2019-09-05 06:00:50 -07:00
Treehugger Robot
2fc007eba5 Merge "Reland: Moving GSI-specific files to system_ext" 2019-09-05 12:45:57 +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
b5195f128d Merge "Revert "Moving GSI-specific files to system_ext""
am: 414108c6c1

Change-Id: I289dddfc62ee165c9857eace3d703983da32b695
2019-09-04 18:34:31 -07:00
Ian Kasprzak
414108c6c1 Merge "Revert "Moving GSI-specific files to system_ext"" 2019-09-05 01:08:17 +00: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
Xin Li
7a05ffb25c DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: I3ee2eb0c9eebb865231b7cacdd6d12a34e3586e0
2019-09-04 17:56:34 -07:00
Yifan Hong
708cbdbd41 Merge "releasetools: add dep to checkvintf"
am: fd4a3de77d

Change-Id: Ie5ffcd9b96de64129555980d77d851f7672f2083
2019-09-04 17:53:30 -07:00
Yifan Hong
fd4a3de77d Merge "releasetools: add dep to checkvintf" 2019-09-05 00:14:58 +00:00
Yifan Hong
09298552e2 releasetools: add dep to checkvintf
'required' only works on python_binary_host.
Test: modify checkvintf source code, build ota_from_target_files

Change-Id: Ieac68b39b1ccabae679a1679f184cb3aeaaeefb6
2019-09-04 12:37:46 -07:00
Julien Desprez
c264c32770 Merge "Delete cts_instant tasks: not needed anymore"
am: 979c9f3117

Change-Id: I83be1baa082283cb85172aa728ccb4a3f566f8f1
2019-09-04 12:04:12 -07:00
Julien Desprez
979c9f3117 Merge "Delete cts_instant tasks: not needed anymore" 2019-09-04 17:39:55 +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
Treehugger Robot
a6c80c1117 Merge "Moving GSI-specific files to system_ext" 2019-09-04 13:59:17 +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
Julien Desprez
7c519defbd Delete cts_instant tasks: not needed anymore
Cts-instant is now run directly from cts so there is no
need for a dedicated (unmaintained) cts-instant target.

Test: None
Bug: 139302375
Change-Id: Ibac30f182028981cc7ad55b3998fbf6a545f62f1
2019-09-03 14:43:41 -07:00
Bo Hu
75e29ad5d4 Merge "goldfish: support system_ext"
am: 9432b4d052

Change-Id: Iad5ff28eab7ac56a038e192c7aa0f5019e3428a2
2019-09-03 10:40:08 -07:00
Bo Hu
9432b4d052 Merge "goldfish: support system_ext" 2019-09-03 17:15:30 +00: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
2722c66be7 Merge changes from topic "art-without-bionic"
am: 1260ce2fb5

Change-Id: I03851bf14865f7e40dc2ce77561833d03d3b70cc
2019-09-02 03:43:45 -07:00
Martin Stjernholm
874894452f Add new ART APEX.
am: 1ebd568850

Change-Id: I6372bef9ffd3e0f50d6c0bd373b8838cffc58b3b
2019-09-02 03:43:33 -07:00
Martin Stjernholm
1260ce2fb5 Merge changes from topic "art-without-bionic"
* changes:
  Update dexpreopt for the ART APEX name change.
  Add new ART APEX.
2019-09-02 10:28:30 +00:00