Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afbf7237 authored by Justin Klaassen's avatar Justin Klaassen Committed by android-build-merger
Browse files

Merge remote-tracking branch 'aosp/master' 

am: 966030d6

Change-Id: I644e382dc35b9958241d45fa19ab0670797b7e6a
parents 3c6fb73a 966030d6

Android.mk

+8 −4
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ LOCAL_RESOURCE_DIR += frameworks/opt/datetimepicker/res 


ifeq ($(TARGET_BUILD_APPS),)

LOCAL_RESOURCE_DIR += frameworks/support/design/res

LOCAL_RESOURCE_DIR += frameworks/support/v14/percent/res

LOCAL_RESOURCE_DIR += frameworks/support/percent/res

LOCAL_RESOURCE_DIR += frameworks/support/v14/preference/res

LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res

LOCAL_RESOURCE_DIR += frameworks/support/v7/gridlayout/res
@@ -14,7 +14,7 @@ LOCAL_RESOURCE_DIR += frameworks/support/v7/preference/res 
LOCAL_RESOURCE_DIR += frameworks/support/v7/recyclerview/res

else

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/design/res

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v14/percent/res

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/percent/res

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v14/preference/res

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/appcompat/res

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/gridlayout/res
@@ -30,10 +30,14 @@ LOCAL_OVERRIDES_PACKAGES := AlarmClock 


LOCAL_SRC_FILES := $(call all-java-files-under, src gen)



LOCAL_PROGUARD_FLAG_FILES := ../../../frameworks/support/design/proguard-rules.pro

LOCAL_PROGUARD_FLAG_FILES += ../../../frameworks/support/v7/preference/proguard-rules.pro

LOCAL_PROGUARD_FLAG_FILES += ../../../frameworks/support/v7/recyclerview/proguard-rules.pro



LOCAL_STATIC_JAVA_LIBRARIES := android-opt-datetimepicker

LOCAL_STATIC_JAVA_LIBRARIES += android-support-design

LOCAL_STATIC_JAVA_LIBRARIES += android-support-percent

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v14-percent

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v14-preference

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout
@@ -42,7 +46,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview 


LOCAL_AAPT_FLAGS := --auto-add-overlay

LOCAL_AAPT_FLAGS += --extra-packages android.support.design

LOCAL_AAPT_FLAGS += --extra-packages android.support.v14.percent

LOCAL_AAPT_FLAGS += --extra-packages android.support.percent

LOCAL_AAPT_FLAGS += --extra-packages android.support.v14.preference

LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat

LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.gridlayout

gen/com/android/deskclock/BuildConfig.java

+2 −1
Original line number Diff line number Diff line
@@ -17,5 +17,6 @@ 
package com.android.deskclock;



public final class BuildConfig {

    public static final boolean DEBUG = false;

    public static final String APPLICATION_ID = "com.android.deskclock";

}