android/vendor_gapps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix makefile guarding (for real)

Browse Source 
* previously definitions for different arches would conflict

Signed-off-by: Paul Keith <javelinanddart@bestas.gr>
This commit is contained in:
Paul Keith 2017-04-06 14:49:53 -05:00
parent b35c6bdd57
commit 2c6d5966f7
No known key found for this signature in database
GPG Key ID: AB0BF746E05523CF
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arm/Android.mk
View File

@ -16,7 +16,7 @@
LOCAL_PATH := $(call my-dir)
ifneq ($(TARGET_DEVICE),)
ifneq ($(filter arm,$(TARGET_ARCH)),)
include $(CLEAR_VARS)
LOCAL_MODULE := PrebuiltGmsCore

2
arm64/Android.mk
View File

@ -16,7 +16,7 @@
LOCAL_PATH := $(call my-dir)
ifneq ($(TARGET_DEVICE),)
ifneq ($(filter arm64,$(TARGET_ARCH)),)
include $(CLEAR_VARS)
LOCAL_MODULE := PrebuiltGmsCore

2
common/Android.mk
View File

@ -16,7 +16,7 @@
LOCAL_PATH := $(call my-dir)
ifneq ($(TARGET_DEVICE),)
ifneq ($(filter arm arm64 x86,$(TARGET_ARCH)),)
include $(CLEAR_VARS)
LOCAL_MODULE := GoogleContactsSyncAdapter

10
setup-makefiles.sh
View File

@ -32,10 +32,10 @@ fi
. "$HELPER"
# Initialize the helper for common gapps
setup_vendor "$GAPPS_COMMON" "$VENDOR" "$CM_ROOT"
setup_vendor "$GAPPS_COMMON" "$VENDOR" "$CM_ROOT" true
# Copyright headers
write_headers
write_headers "arm arm64 x86"
# Common gapps
write_makefiles "$MY_DIR"/common-proprietary-files.txt
@ -44,10 +44,10 @@ write_makefiles "$MY_DIR"/common-proprietary-files.txt
write_footers
# Reinitialize the helper for target gapps
setup_vendor "$TARGET" "$VENDOR" "$CM_ROOT"
setup_vendor "$TARGET" "$VENDOR" "$CM_ROOT" true
# Copyright headers and guards
write_headers
write_headers "$TARGET"
write_makefiles "$MY_DIR"/proprietary-files-$TARGET.txt
write_makefiles "$MY_DIR"/proprietary-files.txt
@ -57,4 +57,4 @@ printf '\n%s\n' "\$(call inherit-product, vendor/gapps/common/common-vendor.mk)"
# We are done with target
write_footers
for f in `find "$MY_DIR" -type f -name Android.mk`; do sed -i s/ifeq/ifneq/g $f; done
for f in `find "$MY_DIR" -type f -name Android.mk`; do sed -i s/TARGET_DEVICE/TARGET_ARCH/g $f; done