OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8c61d7b
)
Revert "Use the correct prebuilts for lifecycles."
author
Ian Pedowitz
<ijpedowitz@google.com>
Tue, 6 Feb 2018 03:07:12 +0000
(
03:07
+0000)
committer
Ian Pedowitz
<ijpedowitz@google.com>
Tue, 6 Feb 2018 03:23:47 +0000
(
03:23
+0000)
This reverts commit
8c61d7b4b9dd6de37a7acc14f91f8a71623edcc1
.
Reason for revert: b/
72969557
Bug:
72969557
Bug:
72566647
Change-Id: I46bebf253f1dcb5abfdff2f56022675c1dd44219
packages/SettingsLib/common.mk
patch
|
blob
|
history
diff --git
a/packages/SettingsLib/common.mk
b/packages/SettingsLib/common.mk
index
741db34
..
3c2ca2d
100644
(file)
--- a/
packages/SettingsLib/common.mk
+++ b/
packages/SettingsLib/common.mk
@@
-16,11
+16,11
@@
ifeq ($(LOCAL_USE_AAPT2),true)
LOCAL_STATIC_JAVA_LIBRARIES += \
android-support-annotations \
- a
ndroid-arch
-lifecycle-common
+ a
pptoolkit
-lifecycle-common
LOCAL_STATIC_ANDROID_LIBRARIES += \
android-support-v4 \
- a
ndroid-arch
-lifecycle-runtime \
+ a
pptoolkit
-lifecycle-runtime \
android-support-v7-recyclerview \
android-support-v7-preference \
android-support-v7-appcompat \