Commit graph

56348 commits

Author SHA1 Message Date
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
Yifan Hong
b2f1cfbd40 Merge "releasetools: add dep to checkvintf" am: fd4a3de77d am: 708cbdbd41 am: 2ecab77adb am: 978b9d52d5
am: 2712ce11a2

Change-Id: I10141069118c65dcb5f64acdc8610d46fd3ca5b6
2019-09-04 18:27:29 -07:00
Yifan Hong
2712ce11a2 Merge "releasetools: add dep to checkvintf" am: fd4a3de77d am: 708cbdbd41 am: 2ecab77adb
am: 978b9d52d5

Change-Id: I8074db09541cd8ee6677f0086baa3eaca17b7f53
2019-09-04 18:20:28 -07:00
Yifan Hong
978b9d52d5 Merge "releasetools: add dep to checkvintf" am: fd4a3de77d am: 708cbdbd41
am: 2ecab77adb

Change-Id: If7a4e378662e5ae7cbaefcf1c5e58d26e922c145
2019-09-04 18:10:26 -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
Yifan Hong
2ecab77adb Merge "releasetools: add dep to checkvintf" am: fd4a3de77d
am: 708cbdbd41

Change-Id: I30cf49a6668e4f9aa044da8cdcce53af6986a278
2019-09-04 18:02:31 -07: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
Chen Xu
0eedd5d464 Merge "remove telephony-common from boot class" 2019-09-04 23:31:25 +00:00
Julien Desprez
58e71ce89c Merge "Delete cts_instant tasks: not needed anymore" am: 979c9f3117 am: c264c32770 am: a8800e475d am: 2f33b27bf5
am: b495ee8d82

Change-Id: Ie25c293bb68a019efa173de7d1c291b5adf5dfd6
2019-09-04 13:05:19 -07:00
Colin Cross
53553011d0 Keep proguard fields for lite runtime
The lite proto runtime uses reflection to access fields based on the names in
the schema, keep all the fields.

Bug: 117607748
Bug: 140062984
Test: m checkbuild
Change-Id: I39bc7d28f619dd2ccaee603e4d407aa7ad33f534
2019-09-04 12:48:00 -07:00
Colin Cross
7d7cf050a9 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
2019-09-04 12:47:59 -07:00
Colin Cross
588ce8e36b Make javanano a plugin
Treat LOCAL_PROTOC_OPTIMIZE_TYPE := javanano as a plugin by
explicitly passing the path to protoc-gen-javanano.  This allows
removing the javanano customizations from the core plugin code,
which no longer supports javanano natively.

Bug: 117607748
Test: m checkbuild
Change-Id: I913d798136fbee9bfaabe1d815b80c85025cb9b9
2019-09-04 12:47:57 -07:00
Julien Desprez
b495ee8d82 Merge "Delete cts_instant tasks: not needed anymore" am: 979c9f3117 am: c264c32770 am: a8800e475d
am: 2f33b27bf5

Change-Id: I800df0763d8c6fac89aede5150d108d601b96999
2019-09-04 12:47:55 -07:00
Julien Desprez
2f33b27bf5 Merge "Delete cts_instant tasks: not needed anymore" am: 979c9f3117 am: c264c32770
am: a8800e475d

Change-Id: If8b8c7571563e0fd8487873b9b43c28c62a7b3c0
2019-09-04 12:39:54 -07: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
a8800e475d Merge "Delete cts_instant tasks: not needed anymore" am: 979c9f3117
am: c264c32770

Change-Id: Ia0a29cad20792f7eb16a75ba79ddf21cec42683a
2019-09-04 12:20:52 -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
9ecb6b704c Merge "Moving GSI-specific files to system_ext" am: a6c80c1117 am: 478bda0122 am: 3c3db483a1 am: 832f700223
am: 85a542a3f3

Change-Id: Ie5fbd5d2483af9a1e11b578256e7365ec6db5546
2019-09-04 08:54:42 -07:00
Bowgo Tsai
85a542a3f3 Merge "Moving GSI-specific files to system_ext" am: a6c80c1117 am: 478bda0122 am: 3c3db483a1
am: 832f700223

Change-Id: I3878955229accaff90b249d2e2b0850c8d764552
2019-09-04 08:47:44 -07:00
Bowgo Tsai
832f700223 Merge "Moving GSI-specific files to system_ext" am: a6c80c1117 am: 478bda0122
am: 3c3db483a1

Change-Id: I5d62bfb03a26881b2dd9e8d70987fd95a4cb5380
2019-09-04 08:40:44 -07:00
Bowgo Tsai
3c3db483a1 Merge "Moving GSI-specific files to system_ext" am: a6c80c1117
am: 478bda0122

Change-Id: I0b65ae3bb6970ce07a46e9b361e3947e93a06daa
2019-09-04 08:33:37 -07: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
Bo Hu
6e5c171494 Merge "goldfish: support system_ext" am: 9432b4d052 am: 75e29ad5d4 am: 815a6e9bf9 am: 1c8b101c50
am: 877051f78c

Change-Id: Idff752c4b5fe52e1676a140d404464696f8883ad
2019-09-03 16:28:12 -07:00
Martin Stjernholm
733dadc881 [automerger skipped] Merge changes from topic "art-without-bionic" am: 1260ce2fb5 am: 2722c66be7 am: 948c5d4d63 am: 770fe6af41
am: f2709516b7 -s ours
am skip reason: change_id I130eaa6126d347bd1010c02b4f353b9e9b15ef84 with SHA1 e9aa4104b8 is in history

Change-Id: I90561153ba1cb411e295a75ce18efe484a60f2c7
2019-09-03 15:39:46 -07:00
Martin Stjernholm
b148e44d37 [automerger skipped] Add new ART APEX. am: 1ebd568850 am: 874894452f am: 1c82a55fad am: 11962f7c2d
am: e6808d4c4e -s ours
am skip reason: change_id Iaf2ba03b4136482f7fc60d464d012014d58216bd with SHA1 4cb8061dee is in history

Change-Id: I542d629c1983f32befb8e54799cdcd1a4ed12231
2019-09-03 15:39:32 -07:00
Bo Hu
877051f78c Merge "goldfish: support system_ext" am: 9432b4d052 am: 75e29ad5d4 am: 815a6e9bf9
am: 1c8b101c50

Change-Id: I23b84afd421c4684c8dcd0f56068c2bc6f08069b
2019-09-03 15:29:59 -07:00
Chen Xu
195de31de7 remove telephony-common from boot class
As telephony-common is not intended to used by any apps and
being in boot class is not updatability friendly.
We are removing telephony-common from bootclass in R.
we will convert telephony-common to sharedlib (uses-library)
and make sure apps targeting < R will auto load
telephony-common lib for app compatibility.

Bug: 135955937
Test: Build
Change-Id: I57e2d676315caa023121e4315d435f9f928cb39e
2019-09-03 15:25:05 -07:00
Martin Stjernholm
f2709516b7 Merge changes from topic "art-without-bionic" am: 1260ce2fb5 am: 2722c66be7 am: 948c5d4d63
am: 770fe6af41

Change-Id: I47a84e62f023e2019fe8d9e15fccad5b056f8e84
2019-09-03 14:52:58 -07:00
Martin Stjernholm
e6808d4c4e Add new ART APEX. am: 1ebd568850 am: 874894452f am: 1c82a55fad
am: 11962f7c2d

Change-Id: Ia49eaee872497026b755351f3d5beae87fa17454
2019-09-03 14:52:38 -07: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
TreeHugger Robot
087815a9b1 Merge "Disable camera pinning and enable iorapd prefetching by default." 2019-09-03 21:30:09 +00:00
Bo Hu
1c8b101c50 Merge "goldfish: support system_ext" am: 9432b4d052 am: 75e29ad5d4
am: 815a6e9bf9

Change-Id: If58879cce28222e40716f4872bed1d1f6561643d
2019-09-03 10:53:16 -07:00
Bo Hu
815a6e9bf9 Merge "goldfish: support system_ext" am: 9432b4d052
am: 75e29ad5d4

Change-Id: I4109a24d128be3db99cab7ae9af5afeb75f099b6
2019-09-03 10:46:37 -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
770fe6af41 Merge changes from topic "art-without-bionic" am: 1260ce2fb5 am: 2722c66be7
am: 948c5d4d63

Change-Id: I2ba7d96673ccc7aec3c0dfa2dc6f17886c7b8184
2019-09-02 04:21:26 -07:00
Martin Stjernholm
11962f7c2d Add new ART APEX. am: 1ebd568850 am: 874894452f
am: 1c82a55fad

Change-Id: If1642e8799ed6a7579f9a61f08d8b30864ed8c0c
2019-09-02 04:21:15 -07:00
Martin Stjernholm
948c5d4d63 Merge changes from topic "art-without-bionic" am: 1260ce2fb5
am: 2722c66be7

Change-Id: I8980b830747a735e562b516c663f8d0f23b75c50
2019-09-02 04:03:06 -07:00
Martin Stjernholm
1c82a55fad Add new ART APEX. am: 1ebd568850
am: 874894452f

Change-Id: Ib2008f6dd9fa67dbe2d029aaa7adad88934e886a
2019-09-02 04:02:58 -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
Yifan Hong
7b0899081f Merge "Partially Revert "Check VINTF compatibility at OTA generation time."" am: 66d73717b5 am: 92bad9c73d am: 9a3bf5dc09 am: a40ce5331f
am: f888f74cf3

Change-Id: Idff7b5140cc14b4f158ac0291af36fd11c0fd296
2019-08-30 18:10:44 -07:00