Commit graph

56348 commits

Author SHA1 Message Date
Vic Yang
373cc79d51 Merge "Set TARGET_VNDK_USE_CORE_VARIANT for Go devices" am: 63696709ba am: 2e9839d040 am: 9f9a710e24
am: c7935bb1a9

Change-Id: Ib64e12fda96bde4072e37dad4ec196f4cf1be3bd
2019-09-06 14:44:03 -07:00
Vic Yang
c7935bb1a9 Merge "Set TARGET_VNDK_USE_CORE_VARIANT for Go devices" am: 63696709ba am: 2e9839d040
am: 9f9a710e24

Change-Id: Ie55076686a9ee673bae111ea391f2103cc53c50a
2019-09-06 14:27:40 -07:00
Vic Yang
9f9a710e24 Merge "Set TARGET_VNDK_USE_CORE_VARIANT for Go devices" am: 63696709ba
am: 2e9839d040

Change-Id: I7cadf13585dc02946368fec356d47acec14248da
2019-09-06 14:17:39 -07:00
Colin Cross
f4b97e9692 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-06 18:01:09 +00: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
Vic Yang
63696709ba Merge "Set TARGET_VNDK_USE_CORE_VARIANT for Go devices" 2019-09-06 17:39:40 +00:00
Colin Cross
3034d48d1a Merge "Dist proguard dictionaries for platform builds" am: c2ecd76a0b am: 26296995af am: 87f8d0a875 am: dd9aa4d64a
am: b7c650202e

Change-Id: If66009bf834a022178be10a49909bac03fa566d5
2019-09-06 10:03:43 -07:00
Colin Cross
b7c650202e Merge "Dist proguard dictionaries for platform builds" am: c2ecd76a0b am: 26296995af am: 87f8d0a875
am: dd9aa4d64a

Change-Id: I7f660c9e25e5dedb6bc57cdfa32bb9ad9a63bc19
2019-09-06 09:49:43 -07:00
Colin Cross
dd9aa4d64a Merge "Dist proguard dictionaries for platform builds" am: c2ecd76a0b am: 26296995af
am: 87f8d0a875

Change-Id: I95cf0bae353d6966ec68bfa59457a1b16a92e066
2019-09-06 09:42:42 -07:00
Colin Cross
87f8d0a875 Merge "Dist proguard dictionaries for platform builds" am: c2ecd76a0b
am: 26296995af

Change-Id: I19ce5d6c0b753252c63ff890ed53fb312b97e6ab
2019-09-06 09:30:33 -07: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
f46cb9c724 Merge "Support injecting boringssl hash in Make" am: 354dcef215 am: 6676057eec am: f6b47af2d0 am: 75d5ebb5ae
am: 9fd096cf84

Change-Id: I82d35c5b8183ef02ead875ef521c808bec74a903
2019-09-05 21:59:39 -07:00
Colin Cross
9fd096cf84 Merge "Support injecting boringssl hash in Make" am: 354dcef215 am: 6676057eec am: f6b47af2d0
am: 75d5ebb5ae

Change-Id: I2a5b0ee1b63bf424424cb20d9a7779ecdbd28f8c
2019-09-05 21:53:06 -07:00
Colin Cross
75d5ebb5ae Merge "Support injecting boringssl hash in Make" am: 354dcef215 am: 6676057eec
am: f6b47af2d0

Change-Id: I1d53df598edfb6cc31ad709397b17cf41af346cc
2019-09-05 21:44:47 -07:00
Colin Cross
f6b47af2d0 Merge "Support injecting boringssl hash in Make" am: 354dcef215
am: 6676057eec

Change-Id: I9db433ace89736a42c49c324fc9addab8bd7439d
2019-09-05 21:38:19 -07: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
496d630e2b Merge "Switch to toybox stat on macOS too." am: fdef43d69c am: 7fde0b2e81 am: f279e6d010 am: a6728e1f1d
am: 386902d9db

Change-Id: I98e400cd07f36bcc7204ef44915376dd50771ed8
2019-09-05 17:22:52 -07:00
Elliott Hughes
386902d9db Merge "Switch to toybox stat on macOS too." am: fdef43d69c am: 7fde0b2e81 am: f279e6d010
am: a6728e1f1d

Change-Id: I98f615b19fcbaaea200316818affa8b08698c1a9
2019-09-05 17:15:33 -07:00
Elliott Hughes
a6728e1f1d Merge "Switch to toybox stat on macOS too." am: fdef43d69c am: 7fde0b2e81
am: f279e6d010

Change-Id: I29aef3505eaa4bfabf6e20d8ee58f81ccb83e169
2019-09-05 17:08:35 -07:00
Elliott Hughes
f279e6d010 Merge "Switch to toybox stat on macOS too." am: fdef43d69c
am: 7fde0b2e81

Change-Id: Ic2f0e64171416e291a39b8cb5975ec02afc7d414
2019-09-05 16:52:23 -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
Xin Li
1897870c39 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: c271afebaa -s ours am: 65a5523790 -s ours am: c12f986b84 am: 324fc9cb52
am: 4ee56b7873 -s ours
am skip reason: subject contains skip directive

Change-Id: I1bf984210727c01d2fad740e6456eeb30c40a794
2019-09-05 15:48:19 -07:00
Xin Li
9a7c40e749 [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 7a05ffb25c -s ours am: 08657f02b4 -s ours am: 02d5b01493 am: a7419cdb48
am: b220562119 -s ours
am skip reason: subject contains skip directive

Change-Id: If37b3a127a104ebe4985c39cfeb670dad03ff185
2019-09-05 15:33:14 -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
Xin Li
4ee56b7873 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: c271afebaa -s ours am: 65a5523790 -s ours am: c12f986b84
am: 324fc9cb52

Change-Id: If2f3acb0da7a0910cf3de20d5665c58ddd8d0b02
2019-09-05 15:18:45 -07:00
Xin Li
b220562119 [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 7a05ffb25c -s ours am: 08657f02b4 -s ours am: 02d5b01493
am: a7419cdb48

Change-Id: I38dc74161da26fd343f98f870085f073f2d0b442
2019-09-05 15:05:18 -07:00
Xin Li
324fc9cb52 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: c271afebaa -s ours am: 65a5523790 -s ours
am: c12f986b84

Change-Id: I4adc38d6c9429cc6e04f74567c7ed9750d319310
2019-09-05 14:58:31 -07:00
Xin Li
a7419cdb48 [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 7a05ffb25c -s ours am: 08657f02b4 -s ours
am: 02d5b01493

Change-Id: I5d76bb7c4f74c13a82923e6f3fe6b0f62401c48d
2019-09-05 14:44:29 -07:00
Xin Li
c12f986b84 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: c271afebaa -s ours
am: 65a5523790 -s ours
am skip reason: subject contains skip directive

Change-Id: I6f436343c4d8bb6f482631723a85ec7c97b863d5
2019-09-05 14:16:59 -07:00
Xin Li
02d5b01493 [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 7a05ffb25c -s ours
am: 08657f02b4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie0337fdeb2845e3d9dfdf7aedc604d085e2f4258
2019-09-05 14:06:47 -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
00f0d9464a Merge "Reland: Moving GSI-specific files to system_ext" am: 2fc007eba5 am: ab38d47d5a am: 5493629216 am: a93e381076
am: 7599e0abbf

Change-Id: I84c36107c4729641128274ba0d3974decde03ecd
2019-09-05 06:29:29 -07:00
Bowgo Tsai
7599e0abbf Merge "Reland: Moving GSI-specific files to system_ext" am: 2fc007eba5 am: ab38d47d5a am: 5493629216
am: a93e381076

Change-Id: Ib5f44744322b24d6024ef1dada7bedb6decde8ea
2019-09-05 06:21:31 -07:00
Bowgo Tsai
a93e381076 Merge "Reland: Moving GSI-specific files to system_ext" am: 2fc007eba5 am: ab38d47d5a
am: 5493629216

Change-Id: I30d1808006ad64fe636a45d3b1c93ed4c2bcafc6
2019-09-05 06:14:32 -07:00
Bowgo Tsai
5493629216 Merge "Reland: Moving GSI-specific files to system_ext" am: 2fc007eba5
am: ab38d47d5a

Change-Id: I94b5773fe7f059833a4e33f5a83343c3904616c7
2019-09-05 06:07:21 -07: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
8809335740 Merge "Revert "Moving GSI-specific files to system_ext"" am: 414108c6c1 am: b5195f128d am: c1b6e703a9 am: 303eaac2c0
am: 40448f262e

Change-Id: I75810255c2523e38fb35506b222b425198018139
2019-09-04 19:02:43 -07:00
Ian Kasprzak
40448f262e Merge "Revert "Moving GSI-specific files to system_ext"" am: 414108c6c1 am: b5195f128d am: c1b6e703a9
am: 303eaac2c0

Change-Id: Ia2670946ee464dc5f7ea3d158eb8f4d01c055c37
2019-09-04 18:55:39 -07:00
Ian Kasprzak
303eaac2c0 Merge "Revert "Moving GSI-specific files to system_ext"" am: 414108c6c1 am: b5195f128d
am: c1b6e703a9

Change-Id: I26d6c5d665d1a5d2df516d720d466b7f7d6ed240
2019-09-04 18:48:09 -07:00
Ian Kasprzak
c1b6e703a9 Merge "Revert "Moving GSI-specific files to system_ext"" am: 414108c6c1
am: b5195f128d

Change-Id: Id836293b44a5456dfaf6a66bca5b83f5d3f2459e
2019-09-04 18:41:30 -07:00