Commit graph

55437 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
a40ce5331f Merge "Partially Revert "Check VINTF compatibility at OTA generation time."" am: 66d73717b5 am: 92bad9c73d
am: 9a3bf5dc09

Change-Id: Ibc77162b3f1d5a28be64c781725dd42037073469
2019-08-30 17:56:53 -07:00
Yifan Hong
9a3bf5dc09 Merge "Partially Revert "Check VINTF compatibility at OTA generation time."" am: 66d73717b5
am: 92bad9c73d

Change-Id: I152d760442d49dd27410170cb66fb3a438b14e5f
2019-08-30 17:49:28 -07:00
Yifan Hong
92bad9c73d Merge "Partially Revert "Check VINTF compatibility at OTA generation time.""
am: 66d73717b5

Change-Id: I6629fdc810730ad8db28867d8d9912982cd4f6ff
2019-08-30 17:42:32 -07:00
Yifan Hong
66d73717b5 Merge "Partially Revert "Check VINTF compatibility at OTA generation time."" 2019-08-31 00:22:29 +00:00
Yifan Hong
948b259b52 Partially Revert "Check VINTF compatibility at OTA generation time."
This partially reverts commit 9276cf0226.

Reason for revert: broke mixed build

Put META/{system,vendor}_{manifest,matrix}.xml back because mixed builds
needs this.

Bug: 140217956
Test: mainline builds

Change-Id: I80898a17d6b86b17114b729d905dd9ab10bc927a
2019-08-30 12:54:09 -07:00
Tao Bao
85dd2d7d6e Merge "releasetools: img_from_target_files uses zip2zip." am: f833a75283 am: bce0264348
am: 4c29efc4e7

Change-Id: Ia9954ef003c0767985d03ce935ceee31ae9042b3
2019-08-30 12:45:47 -07:00
Tao Bao
4c29efc4e7 Merge "releasetools: img_from_target_files uses zip2zip." am: f833a75283
am: bce0264348

Change-Id: Ie3c365c43aa314fa5fcc1c1aef2b28c66c823a7f
2019-08-30 12:37:43 -07:00
Tao Bao
bce0264348 Merge "releasetools: img_from_target_files uses zip2zip."
am: f833a75283

Change-Id: I1731934e5585185167db9638c7b6652871fbf913
2019-08-30 12:29:42 -07:00
Tao Bao
f833a75283 Merge "releasetools: img_from_target_files uses zip2zip." 2019-08-30 19:13:59 +00: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
Martin Stjernholm
b324175118 Update dexpreopt for the ART APEX name change.
Test: Build & boot
Bug: 135753770
Exempt-From-Owner-Approval: Approved internally
Change-Id: I130eaa6126d347bd1010c02b4f353b9e9b15ef84
Merged-In: I130eaa6126d347bd1010c02b4f353b9e9b15ef84
2019-08-30 17:47:30 +01:00
Juju Sung
2e585b01d4 Merge "Remove extra brackets in vndk_packages collecting phase" am: 8f4f97da3f am: dd173ae513
am: 682c22ef3a

Change-Id: I29d237b73309eff9ddcca145a561c66946da498c
2019-08-29 23:23:49 -07:00
Juju Sung
682c22ef3a Merge "Remove extra brackets in vndk_packages collecting phase" am: 8f4f97da3f
am: dd173ae513

Change-Id: Ibdf8473deba3b5dda69dbae62cdad0e8e3946e7c
2019-08-29 23:16:47 -07: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
Treehugger Robot
8f4f97da3f Merge "Remove extra brackets in vndk_packages collecting phase" 2019-08-30 03:53:35 +00: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
Tianjie Xu
77cde316da Merge "Add a new flag "--disable_fec_computation" for OTA generation" am: 9c9993c706 am: 8b106fd2bc
am: d4495d3077

Change-Id: I7c0167cfdac248012903857b5ef806d76ed44350
2019-08-29 13:49:54 -07:00
Tianjie Xu
d4495d3077 Merge "Add a new flag "--disable_fec_computation" for OTA generation" am: 9c9993c706
am: 8b106fd2bc

Change-Id: Id5d0d95ab8b85de4d9649357372ce8a89e946880
2019-08-29 13:33:45 -07:00