tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
52136 commits 1 branch 0 tags 119 MiB
Commit graph

52136 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yifan Hong
7a8ffbeb9f resolve merge conflicts of 7bd8a3692f to master 
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I16278376fb4a2b26f15b675016d00819ea99c296
 2019-04-01 09:53:23 -07:00
Yifan Hong
7bd8a3692f Merge "Move super.img to obj/PACKAGING" am: c2fe916233 
am: b2c5bdd9a5

Change-Id: I5d10c1baa454ef7d94203bed3bfeba56f301d485
 2019-04-01 09:38:12 -07:00
Yifan Hong
b2c5bdd9a5 Merge "Move super.img to obj/PACKAGING" 
am: c2fe916233

Change-Id: I71deec3850e2bd7b8cb2b4cefe926d3f49f732e7
 2019-04-01 09:35:02 -07:00
Treehugger Robot
c2fe916233 Merge "Move super.img to obj/PACKAGING" 2019-04-01 16:21:07 +00:00
Bowgo Tsai
8859e60fd7 Merge "Adding gsk_keys.mk" am: a719f02197 am: 016e83a83a 
am: f3e70324f1

Change-Id: Ifd2a307669c879c3b59e9300bcdedae7ca313158
 2019-04-01 07:14:08 -07:00
Bowgo Tsai
f3e70324f1 Merge "Adding gsk_keys.mk" am: a719f02197 
am: 016e83a83a

Change-Id: I4dc6f6aaa83dc6137e329deffa012d0e22f40e22
 2019-04-01 07:05:02 -07:00
Bowgo Tsai
016e83a83a Merge "Adding gsk_keys.mk" 
am: a719f02197

Change-Id: I3fd3963f3aa1041aec80c582f66559eb5d3ce771
 2019-04-01 06:59:45 -07:00
Treehugger Robot
a719f02197 Merge "Adding gsk_keys.mk" 2019-04-01 13:43:34 +00:00
Bowgo Tsai
a0e177edba Adding gsk_keys.mk 
Adds the following line into a device.mk in order to include
GSI keys into the first-stage ramdisk.

   $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_keys.mk)

Bug: 112293933
Test: make checks $OUT/ramdisk/avb/.
Change-Id: I8e4a9a8dd607916a3f45a07e0ba14c58def5d8d3
 2019-04-01 18:24:35 +08:00
Jiwen Cai
c03e3c9341 Merge "Remove android.frameworks.bufferhub@1.0-service" 2019-03-31 23:37:44 +00:00
Colin Cross
61f950398a Merge "Remove media_cmd from product packages" 2019-03-30 00:45:05 +00:00
Yifan Hong
5478754cd6 Move super.img to obj/PACKAGING 
To avoid the confusion. super.img isn't intended to be flashed
during day-to-day development.

Test: m superimage
Bug: 128891161
Change-Id: I9d62e5929b415343b2d890ab21e6ae51175af2ae
 2019-03-29 14:47:28 -07:00
Jiwen 'Steve' Cai
eee1046b50 Remove android.frameworks.bufferhub@1.0-service 
Disable this for Q. We will add this back once Q branches.

Bug: 128320950
Bug: 123429755
Test: Build system
Change-Id: I1d360c7a8890148be6197092ba149203a72a019d
 2019-03-29 11:51:42 -07:00
Colin Cross
a13f3750f4 Remove media_cmd from product packages 
The jar for the media command line tool is now installed as a
dependency of the media package.

Bug: 122332340
Test: lunch generic-eng && m nothing
Change-Id: I15ef7cb373ff249887f5641ca9c9722bfc3263a2
 2019-03-29 11:04:19 -07:00
Anton Hansson
cf0b72a241 Merge "Access PRODUCT_ variables directly" am: 8adf501905 am: ffed666e07 
am: 9ff3ac88c6

Change-Id: Ica9e69e2252d89c7cbc5681b772b78e7bc3913e4
 2019-03-29 10:16:52 -07:00
Anton Hansson
2abc1dcb64 Merge "Automate the strip and assignment of PRODUCT_ vars" am: b5cec0d792 am: 15780ecbbb 
am: 23919b3dd4

Change-Id: I4cfedab055b60212262274a6e31c1dae6234aa02
 2019-03-29 10:15:44 -07:00
Anton Hansson
9ff3ac88c6 Merge "Access PRODUCT_ variables directly" am: 8adf501905 
am: ffed666e07

Change-Id: I9880fdf0b3a242932b9402b384222f3d45e6d5cd
 2019-03-29 10:12:06 -07:00
Anton Hansson
23919b3dd4 Merge "Automate the strip and assignment of PRODUCT_ vars" am: b5cec0d792 
am: 15780ecbbb

Change-Id: I64ed86f6e27fd0da2058b832fc1fb277af0d490d
 2019-03-29 10:11:13 -07:00
Anton Hansson
ffed666e07 Merge "Access PRODUCT_ variables directly" 
am: 8adf501905

Change-Id: Ic22d18e3bba7bd2dc744978f8b004717a5737023
 2019-03-29 10:08:00 -07:00
Anton Hansson
15780ecbbb Merge "Automate the strip and assignment of PRODUCT_ vars" 
am: b5cec0d792

Change-Id: Ia916e2244b34b5f88a9065356a47615a01839a5d
 2019-03-29 10:07:04 -07:00
Anton Hansson
8adf501905 Merge "Access PRODUCT_ variables directly" 2019-03-29 16:54:47 +00:00
Anton Hansson
b5cec0d792 Merge "Automate the strip and assignment of PRODUCT_ vars" 2019-03-29 16:54:25 +00:00
Martin Stjernholm
480ab2ad7c Merge "Make the APEX lib absence check optional, for local use." am: 20ac920654 am: 4598286860 
am: 9791a3c4d7

Change-Id: I5fd9cb75aed919c8d933e9e8a825a32eae69372f
 2019-03-29 07:10:20 -07:00
Martin Stjernholm
9791a3c4d7 Merge "Make the APEX lib absence check optional, for local use." am: 20ac920654 
am: 4598286860

Change-Id: Ief2749e8afa022d3a430dcd5ea376c2dee5496a1
 2019-03-29 07:06:09 -07:00
Martin Stjernholm
4598286860 Merge "Make the APEX lib absence check optional, for local use." 
am: 20ac920654

Change-Id: I076fa80c2a5496eaf0619a8c6a80fc77d698e0ee
 2019-03-29 07:01:58 -07:00
Treehugger Robot
20ac920654 Merge "Make the APEX lib absence check optional, for local use." 2019-03-29 13:43:32 +00:00
Daniel Norman
b2852ae287 Merge "Adds some tests for merge_target_files." am: 482e67f4ee am: d8414c71b8 
am: 1abb3e3371

Change-Id: Ifd603539b53807c347ccb93e2306d4d989693bd5
 2019-03-28 21:39:10 -07:00
Daniel Norman
1abb3e3371 Merge "Adds some tests for merge_target_files." am: 482e67f4ee 
am: d8414c71b8

Change-Id: Iddd840b1708d9ce8df4b171b58f12b29d5f8c1e1
 2019-03-28 21:35:57 -07:00
Daniel Norman
d8414c71b8 Merge "Adds some tests for merge_target_files." 
am: 482e67f4ee

Change-Id: I246a1e6f2afceb42a5aca56b46291fbd37860ac5
 2019-03-28 21:30:49 -07:00
Treehugger Robot
482e67f4ee Merge "Adds some tests for merge_target_files." 2019-03-29 04:16:57 +00:00
Dan Willemsen
e5b842206f Merge "Stop installing host packages via PRODUCT_PACKAGES" am: 672e98fac8 am: cc2155aa37 
am: 7e8cc8ce6c

Change-Id: I13151a5e1918d5de18dbda6939da14a4d1be36b1
 2019-03-28 20:34:08 -07:00
Dan Willemsen
7e8cc8ce6c Merge "Stop installing host packages via PRODUCT_PACKAGES" am: 672e98fac8 
am: cc2155aa37

Change-Id: I11054d1c97426e30baafa97ec59bc5df45d27b39
 2019-03-28 20:30:01 -07:00
Dan Willemsen
cc2155aa37 Merge "Stop installing host packages via PRODUCT_PACKAGES" 
am: 672e98fac8

Change-Id: I0db73bc1f59b8f50f5529cbd0992fab9aa808a1b
 2019-03-28 20:25:48 -07:00
SzuWei Lin
3f4ca06313 Merge "Fix build error on empty ramdisk" am: 5d225276ca am: debaf1b8af 
am: 3e3c738d7f

Change-Id: I239d210569588636fde36bc2a545b80a16dc2509
 2019-03-28 20:22:02 -07:00
Dan Willemsen
672e98fac8 Merge "Stop installing host packages via PRODUCT_PACKAGES" 2019-03-29 03:20:52 +00:00
SzuWei Lin
3e3c738d7f Merge "Fix build error on empty ramdisk" am: 5d225276ca 
am: debaf1b8af

Change-Id: I0604d288ab42f3a347b6f5de22d7fb4742f6ea05
 2019-03-28 20:17:53 -07:00
SzuWei Lin
debaf1b8af Merge "Fix build error on empty ramdisk" 
am: 5d225276ca

Change-Id: I4f550bbd49dbbeb90d2855c13fb066bcd33b8e4a
 2019-03-28 20:13:43 -07:00
Treehugger Robot
5d225276ca Merge "Fix build error on empty ramdisk" 2019-03-29 03:03:00 +00:00
Daniel Norman
6d82fa3961 Adds some tests for merge_target_files. 
Test: python -m unittest test_merge_target_files
Bug: 129262038
Change-Id: Ibcb3b384b81ceaa1924a6cd402a8880bd3cfbba6
 2019-03-28 14:43:30 -07:00
Anton Hansson
8dab0a6f50 Access PRODUCT_ variables directly 
This CL simplifies the PRODUCTS.$(INTERNAL_PRODUCT).X accesses of
product variables, and removes unnecessary stripping of them.

Replace: '\$\(PRODUCTS\.\$\(INTERNAL_PRODUCT\)\.([^\)]*)\)' with '$(\1)'
Replace: '\$\(strip\s*\$\(PRODUCT_([^\)]*)\)\)' with '$(PRODUCT_\1)'

A few minor manual tweaks.

Bug: 116769560
Test: presubmit
Change-Id: I70c54f1582e3cc780028535960147d99ebc2e0e1
 2019-03-28 15:54:25 +00:00
Anton Hansson
13ea2a6a7d Automate the strip and assignment of PRODUCT_ vars 
With this change, all PRODUCT_ variables are treated the same
when it comes to stripping and assigning them to their final
variable name. In the past, all the PRODUCT variables needed
to be listed in two places to achieve this.

The documentation previously attached to the strip/assignment
is moved to the PRODUCT_ variable list in product.mk.

Also refactor some of the default value logic to cope with
the new automation.

Many places in the build system that currently refer to
$(PRODUCTS.$(INTERNAL_PRODUCT).X) can now be modified to
use $(X) directly.

Bug: 116769560
Test: verified noop on PRODUCT_ variables on all products in the tree
Change-Id: I5677c355e81359b1d3c0db2a2232941097a05047
 2019-03-28 15:26:49 +00:00
Martin Stjernholm
c9d5858f58 Make the APEX lib absence check optional, for local use. 
Test: m systemimage (with and without failure)
Bug: 124293228
Bug: 129466457
Change-Id: I8bf5ba51232bb9961bdedd56d0f17ee1d8698f54
 2019-03-28 15:08:32 +00:00
SzuWei Lin
29770fa2bf Fix build error on empty ramdisk 
package `init_vendor` is the only content of ramdisk so far.
We would get build error if we do not include init_vendor.
The patch fix the build error for the case that ramdisk is empty.

Bug: 129386309
Test: lunch aosp_arm64_ab-userdebug; make ramdisk -j
Test: Build pass
Change-Id: I7c7c828b5f29350268d4789393b90740dd68162d
 2019-03-28 13:41:01 +00:00
TreeHugger Robot
bc1246688d Merge "Revert "Revert "Add libstagefright_omx_soft to vndk""" 2019-03-28 02:34:25 +00:00
Chong Zhang
f36de45bf8 Revert "Revert "Add libstagefright_omx_soft to vndk"" 
This reverts commit aabadd18ae.

Reason for revert: Reland

Change-Id: I02dee8cd07283f484efa48265495fa3839701d50
 2019-03-27 18:53:40 +00:00
Colin Cross
c2bf5dd2a3 Merge "Understand the support library/androidx @Keep annotations" am: 3f6483cb0f am: d4ada79abd 
am: 2172041a44

Change-Id: I5a72c50d7ef89cf8f4a4130b2fa13e1b6f297f03
 2019-03-27 11:33:24 -07:00
Colin Cross
2172041a44 Merge "Understand the support library/androidx @Keep annotations" am: 3f6483cb0f 
am: d4ada79abd

Change-Id: Iec62861e620719e4a9601b5beee7208569954c5b
 2019-03-27 11:25:16 -07:00
Colin Cross
d4ada79abd Merge "Understand the support library/androidx @Keep annotations" 
am: 3f6483cb0f

Change-Id: I4997b8d4aa6799eb262453b09c0549a509dcc012
 2019-03-27 11:21:37 -07:00
Treehugger Robot
3f6483cb0f Merge "Understand the support library/androidx @Keep annotations" 2019-03-27 18:01:28 +00:00
Tao Bao
f1a39e9170 Merge "releasetools: Remove the sanity check on APEX payload key names." am: c292edc22c am: ea673330bd 
am: bce744ef67

Change-Id: I26cf08f34a974eaef13e55af3b590892df713d06
 2019-03-27 09:05:58 -07:00