openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

resolve merge conflicts of 07886f1 to nyc-dev-plus-aosp am: 98dce87fe1 

am: 589ed96538

Change-Id: Ibe488f2cfd6570724dcdfdd69e2ee0396d7af631
This commit is contained in:
Vikas Marwaha 2016-06-09 05:57:55 +00:00 committed by android-build-merger
parent 89368014ac 589ed96538
commit 43ded3587e
5 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/product.mk
View File

@ -125,7 +125,6 @@ _product_var_list := \
PRODUCT_SHIPPING_API_LEVEL \
define dump-product
$(info ==== $(1) ====)\
$(foreach v,$(_product_var_list),\

3
target/product/product_launched_with_l.mk Normal file
View File

@ -0,0 +1,3 @@
#PRODUCT_SHIPPING_API_LEVEL indicates the first api level, device has been commercially launced on.
PRODUCT_SHIPPING_API_LEVEL := 21

2
target/product/product_launched_with_l_mr1.mk Normal file
View File

@ -0,0 +1,2 @@
#PRODUCT_SHIPPING_API_LEVEL indicates the first api level, device has been commercially launced on.
PRODUCT_SHIPPING_API_LEVEL := 22

2
target/product/product_launched_with_m.mk Normal file
View File

@ -0,0 +1,2 @@
#PRODUCT_SHIPPING_API_LEVEL indicates the first api level, device has been commercially launced on.
PRODUCT_SHIPPING_API_LEVEL := 23

2
target/product/product_launched_with_n.mk Normal file
View File

@ -0,0 +1,2 @@
#PRODUCT_SHIPPING_API_LEVEL indicates the first api level, device has been commercially launced on.
PRODUCT_SHIPPING_API_LEVEL := 24