summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustArchi <JustArchi@JustArchi.net>2014-12-17 17:06:05 +0100
committerforkbomb <keepcalm444@gmail.com>2015-11-25 08:13:28 +1100
commitb45b674d92ad01911314172c28b599b3fed8735b (patch)
treeaf7f2273f07b9c268a904be120821408b2369cb2
parent959f46a26e46a3febd3712b30cb067341665ad6b (diff)
downloaddevice_samsung_i9300-b45b674d92ad01911314172c28b599b3fed8735b.zip
device_samsung_i9300-b45b674d92ad01911314172c28b599b3fed8735b.tar.gz
device_samsung_i9300-b45b674d92ad01911314172c28b599b3fed8735b.tar.bz2
i9300: Use open-source camera again
Conflicts: BoardConfig.mk Change-Id: I5794d6c3fb2e2ca542fc0eff65317334be9047b7
-rw-r--r--BoardConfig.mk4
-rw-r--r--i9300.mk4
-rw-r--r--proprietary-files.txt1
3 files changed, 2 insertions, 7 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index f029f01..87cae67 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -43,9 +43,5 @@ BOARD_SEPOLICY_DIRS += \
# assert
TARGET_OTA_ASSERT_DEVICE := m0,i9300,GT-I9300
-COMMON_GLOBAL_CFLAGS += -DNEEDS_VECTORIMPL_SYMBOLS
-
-TARGET_PROVIDES_CAMERA_HAL := true
-
# inherit from the proprietary version
-include vendor/samsung/i9300/BoardConfigVendor.mk
diff --git a/i9300.mk b/i9300.mk
index ca1e37f..a5a1880 100644
--- a/i9300.mk
+++ b/i9300.mk
@@ -63,9 +63,9 @@ PRODUCT_PACKAGES += \
Nfc \
Tag
-# Camera Wrapper
+# Camera
PRODUCT_PACKAGES += \
- camera.exynos4
+ camera.smdk4x12
PRODUCT_COPY_FILES += \
packages/apps/Nfc/migrate_nfc.txt:system/etc/updatecmds/migrate_nfc.txt \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 177bedc..56fe3d8 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,5 +1,4 @@
system/bin/gpsd
-system/lib/hw/camera.vendor.smdk4x12.so
system/lib/hw/gps.exynos4.so
system/lib/libsec-ril.so
system/usr/idc/sec_touchscreen.idc