diff options
| author | Andreas Blaesius <skate4life@gmx.de> | 2015-08-12 22:30:34 +0200 |
|---|---|---|
| committer | Andreas Blaesius <skate4life@gmx.de> | 2015-08-12 22:31:44 +0200 |
| commit | 0a7d65dfe662e01cf8932949ff72e20ecf374d98 (patch) | |
| tree | 297525b1074169bea0b5e404f25d697d0cb071ce | |
| parent | d7f9901d8937e1eb842bba2584a3d04cd530855a (diff) | |
| download | device_samsung_espresso3g-0a7d65dfe662e01cf8932949ff72e20ecf374d98.zip device_samsung_espresso3g-0a7d65dfe662e01cf8932949ff72e20ecf374d98.tar.gz device_samsung_espresso3g-0a7d65dfe662e01cf8932949ff72e20ecf374d98.tar.bz2 | |
P51xx: fix missmerge
Remove dock_keyboard,
common aosp overlay get added from espresso-common repo
Change-Id: I5da13bdf71e3096eaf36859c9c900e8a995f80f2
| -rw-r--r-- | dock_keyboard/Android.mk | 11 | ||||
| -rwxr-xr-x | p51xx-common.mk | 2 |
2 files changed, 0 insertions, 13 deletions
diff --git a/dock_keyboard/Android.mk b/dock_keyboard/Android.mk deleted file mode 100644 index 13958bd..0000000 --- a/dock_keyboard/Android.mk +++ /dev/null @@ -1,11 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES:= dock_keyboard_attach.c -LOCAL_MODULE:= dock_kbd_attach -LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES) -LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES += $(KERNEL_HEADERS) -LOCAL_SHARED_LIBRARIES += libutils libcutils - -include $(BUILD_EXECUTABLE) diff --git a/p51xx-common.mk b/p51xx-common.mk index 30e8550..b888359 100755 --- a/p51xx-common.mk +++ b/p51xx-common.mk @@ -17,8 +17,6 @@ # Include espresso-common makefile $(call inherit-product, device/samsung/espresso-common/espresso-common.mk) -DEVICE_PACKAGE_OVERLAYS += device/samsung/espresso-common/overlay/aosp-common - LOCAL_PATH := device/samsung/p5100 # Enable higher-res drawables while keeping mdpi as primary source |