diff options
| author | Jason Monk <jmonk@google.com> | 2015-02-02 17:39:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-02 17:39:45 +0000 |
| commit | a2bfc837ccb89ad9d4ef9dd7ead95b8759846690 (patch) | |
| tree | 8759ed6e3e1d1e881d245c70fa56995844409e71 /packages/SystemUI | |
| parent | af7454bafb99248caa9f02cf96195118d59afeab (diff) | |
| parent | 2ba4ce6a064e29ee3415ff8c2b4a9bbcff937a6c (diff) | |
| download | frameworks_base-a2bfc837ccb89ad9d4ef9dd7ead95b8759846690.zip frameworks_base-a2bfc837ccb89ad9d4ef9dd7ead95b8759846690.tar.gz frameworks_base-a2bfc837ccb89ad9d4ef9dd7ead95b8759846690.tar.bz2 | |
Merge "Create SettingsLib"
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/Android.mk | 2 | ||||
| -rw-r--r-- | packages/SystemUI/tests/Android.mk | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/packages/SystemUI/Android.mk b/packages/SystemUI/Android.mk index 2ff9a28..47ef42a 100644 --- a/packages/SystemUI/Android.mk +++ b/packages/SystemUI/Android.mk @@ -20,6 +20,8 @@ LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/res LOCAL_AAPT_FLAGS := --auto-add-overlay --extra-packages com.android.keyguard +include frameworks/base/packages/SettingsLib/common.mk + include $(BUILD_PACKAGE) ifeq ($(EXCLUDE_SYSTEMUI_TESTS),) diff --git a/packages/SystemUI/tests/Android.mk b/packages/SystemUI/tests/Android.mk index 5a90324..6a7201c 100644 --- a/packages/SystemUI/tests/Android.mk +++ b/packages/SystemUI/tests/Android.mk @@ -36,4 +36,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := mockito-target Keyguard # UI it doesn't own. This is necessary to allow screenshots to be taken LOCAL_CERTIFICATE := platform +include frameworks/base/packages/SettingsLib/common.mk + include $(BUILD_PACKAGE) |