From 52b3cf2cdd7a2d8ca3b8eea8b6a1cac589c698a1 Mon Sep 17 00:00:00 2001 From: Paul Keith Date: Thu, 6 Apr 2017 13:12:04 -0500 Subject: [PATCH] Fix makefiles Change-Id: Ice1b66046a1c8525b91012540907bdfd4b81c5ab Signed-off-by: Paul Keith --- arm/Android.mk | 2 +- arm/arm-vendor.mk | 2 ++ common/Android.mk | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arm/Android.mk b/arm/Android.mk index c7e9ae8..582c7c3 100644 --- a/arm/Android.mk +++ b/arm/Android.mk @@ -16,7 +16,7 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),) +ifneq ($(TARGET_DEVICE),) include $(CLEAR_VARS) LOCAL_MODULE := PrebuiltGmsCore diff --git a/arm/arm-vendor.mk b/arm/arm-vendor.mk index 85725df..a5904af 100644 --- a/arm/arm-vendor.mk +++ b/arm/arm-vendor.mk @@ -20,3 +20,5 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ PrebuiltGmsCore \ SetupWizard + +$(call inherit-product, vendor/gapps/common/common-vendor.mk) diff --git a/common/Android.mk b/common/Android.mk index d88f3f2..8dc6953 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -16,7 +16,7 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),) +ifneq ($(TARGET_DEVICE),) include $(CLEAR_VARS) LOCAL_MODULE := GoogleContactsSyncAdapter