android/vendor_gapps
1
0
派生 0
代码 工单 合并请求 工作流 软件包 项目 发布 百科 活动

Fix makefile guarding (for real)

浏览代码 
* previously definitions for different arches would conflict

Signed-off-by: Paul Keith <javelinanddart@bestas.gr>
这个提交包含在：
Paul Keith
2017-04-06 14:49:53 -05:00
父节点 b35c6bdd57
当前提交 2c6d5966f7
共修改 4 个文件，包含 8 行新增和 8 行删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

2
arm/Android.mk
查看文件

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

2
arm64/Android.mk
查看文件

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

2
common/Android.mk
查看文件

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

10
setup-makefiles.sh
查看文件

@@ -32,10 +32,10 @@ fi
. "$HELPER" . "$HELPER"
# Initialize the helper for common gapps # Initialize the helper for common gapps
setup_vendor "$GAPPS_COMMON" "$VENDOR" "$CM_ROOT" setup_vendor "$GAPPS_COMMON" "$VENDOR" "$CM_ROOT" true
# Copyright headers # Copyright headers
write_headers write_headers "arm arm64 x86"
# Common gapps # Common gapps
write_makefiles "$MY_DIR"/common-proprietary-files.txt write_makefiles "$MY_DIR"/common-proprietary-files.txt
@@ -44,10 +44,10 @@ write_makefiles "$MY_DIR"/common-proprietary-files.txt
write_footers write_footers
# Reinitialize the helper for target gapps # Reinitialize the helper for target gapps
setup_vendor "$TARGET" "$VENDOR" "$CM_ROOT" setup_vendor "$TARGET" "$VENDOR" "$CM_ROOT" true
# Copyright headers and guards # Copyright headers and guards
write_headers write_headers "$TARGET"
write_makefiles "$MY_DIR"/proprietary-files-$TARGET.txt write_makefiles "$MY_DIR"/proprietary-files-$TARGET.txt
write_makefiles "$MY_DIR"/proprietary-files.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 # We are done with target
write_footers 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