setup-makefiles: Rename variables to please extract-tools
This commit is contained in:
@@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*
|
||||
* This file is generated by device/gapps//setup-makefiles.sh
|
||||
* This file is generated by device/gapps/arm/setup-makefiles.sh
|
||||
*/
|
||||
|
||||
soong_namespace {
|
||||
|
||||
@@ -12,10 +12,10 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# This file is generated by device/gapps//setup-makefiles.sh
|
||||
# This file is generated by device/gapps/arm/setup-makefiles.sh
|
||||
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
|
||||
ifneq ($(filter arm,$(TARGET_ARCH)),)
|
||||
ifeq ($(TARGET_ARCH),arm)
|
||||
|
||||
endif
|
||||
|
||||
@@ -12,5 +12,5 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# This file is generated by device/gapps//setup-makefiles.sh
|
||||
# This file is generated by device/gapps/arm/setup-makefiles.sh
|
||||
|
||||
|
||||
@@ -12,10 +12,10 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# This file is generated by device/gapps//setup-makefiles.sh
|
||||
# This file is generated by device/gapps/arm/setup-makefiles.sh
|
||||
|
||||
PRODUCT_SOONG_NAMESPACES += \
|
||||
vendor/gapps/
|
||||
vendor/gapps/arm
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
vendor/gapps/arm/proprietary/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libjni_latinimegoogle.so
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*
|
||||
* This file is generated by device/gapps//setup-makefiles.sh
|
||||
* This file is generated by device/gapps/arm64/setup-makefiles.sh
|
||||
*/
|
||||
|
||||
soong_namespace {
|
||||
|
||||
@@ -12,10 +12,10 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# This file is generated by device/gapps//setup-makefiles.sh
|
||||
# This file is generated by device/gapps/arm64/setup-makefiles.sh
|
||||
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
|
||||
ifneq ($(filter arm64,$(TARGET_ARCH)),)
|
||||
ifeq ($(TARGET_ARCH),arm64)
|
||||
|
||||
endif
|
||||
|
||||
@@ -12,5 +12,5 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# This file is generated by device/gapps//setup-makefiles.sh
|
||||
# This file is generated by device/gapps/arm64/setup-makefiles.sh
|
||||
|
||||
|
||||
@@ -12,10 +12,10 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# This file is generated by device/gapps//setup-makefiles.sh
|
||||
# This file is generated by device/gapps/arm64/setup-makefiles.sh
|
||||
|
||||
PRODUCT_SOONG_NAMESPACES += \
|
||||
vendor/gapps/
|
||||
vendor/gapps/arm64
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
vendor/gapps/arm64/proprietary/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libjni_latinimegoogle.so \
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*
|
||||
* This file is generated by device/gapps//setup-makefiles.sh
|
||||
* This file is generated by device/gapps/common/setup-makefiles.sh
|
||||
*/
|
||||
|
||||
soong_namespace {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# This file is generated by device/gapps//setup-makefiles.sh
|
||||
# This file is generated by device/gapps/common/setup-makefiles.sh
|
||||
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
|
||||
|
||||
@@ -12,5 +12,5 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# This file is generated by device/gapps//setup-makefiles.sh
|
||||
# This file is generated by device/gapps/common/setup-makefiles.sh
|
||||
|
||||
|
||||
@@ -12,10 +12,10 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# This file is generated by device/gapps//setup-makefiles.sh
|
||||
# This file is generated by device/gapps/common/setup-makefiles.sh
|
||||
|
||||
PRODUCT_SOONG_NAMESPACES += \
|
||||
vendor/gapps/
|
||||
vendor/gapps/common
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
vendor/gapps/common/proprietary/etc/permissions/com.google.android.dialer.support.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/com.google.android.dialer.support.xml \
|
||||
|
||||
@@ -20,7 +20,7 @@ set -e
|
||||
|
||||
export INITIAL_COPYRIGHT_YEAR=2017
|
||||
|
||||
export GAPPS_COMMON=common
|
||||
export DEVICE_COMMON=common
|
||||
export VENDOR=gapps
|
||||
|
||||
# Load extract_utils and do some sanity checks
|
||||
@@ -37,7 +37,7 @@ fi
|
||||
. "$HELPER"
|
||||
|
||||
# Initialize the helper for common gapps
|
||||
setup_vendor "$GAPPS_COMMON" "$VENDOR" "$LINEAGE_ROOT" true
|
||||
setup_vendor "$DEVICE_COMMON" "$VENDOR" "$LINEAGE_ROOT" true
|
||||
|
||||
# Copyright headers
|
||||
write_headers "arm arm64 x86"
|
||||
@@ -55,19 +55,19 @@ sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK"
|
||||
# We are done with common
|
||||
write_footers
|
||||
|
||||
for TARGET in arm arm64 x86; do
|
||||
for DEVICE in arm arm64 x86; do
|
||||
|
||||
# Reinitialize the helper for target gapps
|
||||
setup_vendor "$TARGET" "$VENDOR" "$LINEAGE_ROOT" true
|
||||
setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT"
|
||||
|
||||
# Copyright headers and guards
|
||||
write_headers "$TARGET"
|
||||
write_headers "$DEVICE"
|
||||
|
||||
write_makefiles "$MY_DIR"/proprietary-files-$TARGET.txt
|
||||
write_makefiles "$MY_DIR"/proprietary-files-$DEVICE.txt
|
||||
|
||||
# Gapps that are too large for grouper
|
||||
echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$PRODUCTMK"
|
||||
write_makefiles "$MY_DIR"/proprietary-files-$TARGET-nongrouper.txt
|
||||
write_makefiles "$MY_DIR"/proprietary-files-$DEVICE-nongrouper.txt
|
||||
echo "endif" >> "$PRODUCTMK"
|
||||
|
||||
printf '\n%s\n' "\$(call inherit-product, vendor/gapps/common/common-vendor.mk)" >> "$PRODUCTMK"
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*
|
||||
* This file is generated by device/gapps//setup-makefiles.sh
|
||||
* This file is generated by device/gapps/x86/setup-makefiles.sh
|
||||
*/
|
||||
|
||||
soong_namespace {
|
||||
|
||||
@@ -12,10 +12,10 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# This file is generated by device/gapps//setup-makefiles.sh
|
||||
# This file is generated by device/gapps/x86/setup-makefiles.sh
|
||||
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
|
||||
ifneq ($(filter x86,$(TARGET_ARCH)),)
|
||||
ifeq ($(TARGET_ARCH),x86)
|
||||
|
||||
endif
|
||||
|
||||
@@ -12,5 +12,5 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# This file is generated by device/gapps//setup-makefiles.sh
|
||||
# This file is generated by device/gapps/x86/setup-makefiles.sh
|
||||
|
||||
|
||||
@@ -12,10 +12,10 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# This file is generated by device/gapps//setup-makefiles.sh
|
||||
# This file is generated by device/gapps/x86/setup-makefiles.sh
|
||||
|
||||
PRODUCT_SOONG_NAMESPACES += \
|
||||
vendor/gapps/
|
||||
vendor/gapps/x86
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
vendor/gapps/x86/proprietary/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libjni_latinimegoogle.so
|
||||
|
||||
Reference in New Issue
Block a user