Commit beed4824 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie

parents a231db18 5539463b
# Copyright (C) 2018 The LineageOS Project # Copyright (C) 2018-2019 The LineageOS Project
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
...@@ -13,10 +13,8 @@ ...@@ -13,10 +13,8 @@
# limitations under the License. # limitations under the License.
$(call inherit-product, build/target/product/aosp_arm.mk) $(call inherit-product, build/target/product/aosp_arm.mk)
$(call inherit-product, vendor/lineage/config/common.mk)
# Allow building otatools include vendor/lineage/build/target/product/lineage_generic_target.mk
TARGET_FORCE_OTA_PACKAGE := true
TARGET_USES_64_BIT_BINDER := true TARGET_USES_64_BIT_BINDER := true
......
# Copyright (C) 2018 The LineageOS Project # Copyright (C) 2018-2019 The LineageOS Project
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
...@@ -13,9 +13,7 @@ ...@@ -13,9 +13,7 @@
# limitations under the License. # limitations under the License.
$(call inherit-product, build/target/product/aosp_arm64.mk) $(call inherit-product, build/target/product/aosp_arm64.mk)
$(call inherit-product, vendor/lineage/config/common.mk)
# Allow building otatools include vendor/lineage/build/target/product/lineage_generic_target.mk
TARGET_FORCE_OTA_PACKAGE := true
PRODUCT_NAME := lineage_arm64 PRODUCT_NAME := lineage_arm64
# Copyright (C) 2019 The LineageOS Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
$(call inherit-product, vendor/lineage/config/common.mk)
PRODUCT_COPY_FILES += \
device/generic/goldfish/data/etc/permissions/privapp-permissions-goldfish.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-goldfish.xml \
# Allow building otatools
TARGET_FORCE_OTA_PACKAGE := true
# Copyright (C) 2018 The LineageOS Project # Copyright (C) 2018-2019 The LineageOS Project
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
...@@ -13,10 +13,8 @@ ...@@ -13,10 +13,8 @@
# limitations under the License. # limitations under the License.
$(call inherit-product, build/target/product/aosp_x86.mk) $(call inherit-product, build/target/product/aosp_x86.mk)
$(call inherit-product, vendor/lineage/config/common.mk)
# Allow building otatools include vendor/lineage/build/target/product/lineage_generic_target.mk
TARGET_FORCE_OTA_PACKAGE := true
TARGET_USES_64_BIT_BINDER := true TARGET_USES_64_BIT_BINDER := true
......
# Copyright (C) 2018 The LineageOS Project # Copyright (C) 2018-2019 The LineageOS Project
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
...@@ -13,9 +13,7 @@ ...@@ -13,9 +13,7 @@
# limitations under the License. # limitations under the License.
$(call inherit-product, build/target/product/aosp_x86_64.mk) $(call inherit-product, build/target/product/aosp_x86_64.mk)
$(call inherit-product, vendor/lineage/config/common.mk)
# Allow building otatools include vendor/lineage/build/target/product/lineage_generic_target.mk
TARGET_FORCE_OTA_PACKAGE := true
PRODUCT_NAME := lineage_x86_64 PRODUCT_NAME := lineage_x86_64
...@@ -20,5 +20,8 @@ ...@@ -20,5 +20,8 @@
as Files app. Including showing of the Documents and "advanced" roots. --> as Files app. Including showing of the Documents and "advanced" roots. -->
<bool name="show_documents_root">true</bool> <bool name="show_documents_root">true</bool>
<!-- Indicates if internal storage is shown as default or not. -->
<bool name="config_default_show_device_root">true</bool>
<string name="default_root_uri" translatable="false">content://com.android.externalstorage.documents/root/primary</string> <string name="default_root_uri" translatable="false">content://com.android.externalstorage.documents/root/primary</string>
</resources> </resources>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment