diff options
| author | Anton Hansson <hansson@google.com> | 2018-10-18 15:32:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-18 15:32:47 +0000 |
| commit | 058f33ec0f3a64403ef7b4039ee3bc828ac5189e (patch) | |
| tree | 0f6dbe62af753989a4afae989cb63f4fb2338b5c | |
| parent | fc1e1a54cd6f8751e1b72395e80284e21eff1121 (diff) | |
| parent | b65a5ba193d48bce908c7357693e1230fff6f1c6 (diff) | |
| download | build-058f33ec0f3a64403ef7b4039ee3bc828ac5189e.tar.gz | |
Merge "Remove PRODUCT_SHIPPING_API_LEVEL in mainline_system"
| -rw-r--r-- | target/product/mainline_system.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk index f86aad820b..ed6dcc9d1a 100644 --- a/target/product/mainline_system.mk +++ b/target/product/mainline_system.mk @@ -69,13 +69,12 @@ PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true PRODUCT_NAME := mainline_system PRODUCT_BRAND := generic -PRODUCT_SHIPPING_API_LEVEL := 28 _base_mk_whitelist := _my_whitelist := $(_base_mk_whitelist) -# Both /system and / are in system.img when PRODUCT_SHIPPING_API_LEVEL>=28. +# For mainline, system.img should be mounted at /, so we include ROOT here. _my_paths := \ $(TARGET_COPY_OUT_ROOT)/ \ $(TARGET_COPY_OUT_SYSTEM)/ \ |