summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--amber/camera/Android.mk (renamed from camera/Android.mk)0
-rw-r--r--amber/camera/include/HdrPlusProfiler.h (renamed from camera/include/HdrPlusProfiler.h)0
-rw-r--r--amber/camera/include/HdrPlusTypes.h (renamed from camera/include/HdrPlusTypes.h)0
-rw-r--r--amber/camera/libhdrplusclient/Android.mk (renamed from camera/libhdrplusclient/Android.mk)4
-rw-r--r--amber/camera/libhdrplusclient/EaselManagerClient.cpp (renamed from camera/libhdrplusclient/EaselManagerClient.cpp)0
-rw-r--r--amber/camera/libhdrplusclient/HdrPlusClientUtils.cpp (renamed from camera/libhdrplusclient/HdrPlusClientUtils.cpp)0
-rw-r--r--amber/camera/libhdrplusclient/include/EaselManagerClient.h (renamed from camera/libhdrplusclient/include/EaselManagerClient.h)0
-rw-r--r--amber/camera/libhdrplusclient/include/HdrPlusClient.h (renamed from camera/libhdrplusclient/include/HdrPlusClient.h)0
-rw-r--r--amber/camera/libhdrplusclient/include/HdrPlusClientListener.h (renamed from camera/libhdrplusclient/include/HdrPlusClientListener.h)0
-rw-r--r--amber/camera/libhdrplusclient/include/HdrPlusClientUtils.h (renamed from camera/libhdrplusclient/include/HdrPlusClientUtils.h)0
10 files changed, 2 insertions, 2 deletions
diff --git a/camera/Android.mk b/amber/camera/Android.mk
index 619c2a6..619c2a6 100644
--- a/camera/Android.mk
+++ b/amber/camera/Android.mk
diff --git a/camera/include/HdrPlusProfiler.h b/amber/camera/include/HdrPlusProfiler.h
index cc277f8..cc277f8 100644
--- a/camera/include/HdrPlusProfiler.h
+++ b/amber/camera/include/HdrPlusProfiler.h
diff --git a/camera/include/HdrPlusTypes.h b/amber/camera/include/HdrPlusTypes.h
index c24a60f..c24a60f 100644
--- a/camera/include/HdrPlusTypes.h
+++ b/amber/camera/include/HdrPlusTypes.h
diff --git a/camera/libhdrplusclient/Android.mk b/amber/camera/libhdrplusclient/Android.mk
index a24eeb2..18db0ac 100644
--- a/camera/libhdrplusclient/Android.mk
+++ b/amber/camera/libhdrplusclient/Android.mk
@@ -41,13 +41,13 @@ LOCAL_EXPORT_HEADER_LIBRARY_HEADERS := \
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/include \
- hardware/google/easel/camera/include
+ hardware/google/easel/amber/camera/include
LOCAL_CFLAGS += -Wall -Wextra -Werror
LOCAL_EXPORT_C_INCLUDE_DIRS += \
$(LOCAL_PATH)/include \
- hardware/google/easel/camera/include
+ hardware/google/easel/amber/camera/include
LOCAL_MODULE:= libhdrplusclient
LOCAL_PROPRIETARY_MODULE := true
diff --git a/camera/libhdrplusclient/EaselManagerClient.cpp b/amber/camera/libhdrplusclient/EaselManagerClient.cpp
index 83bfcf8..83bfcf8 100644
--- a/camera/libhdrplusclient/EaselManagerClient.cpp
+++ b/amber/camera/libhdrplusclient/EaselManagerClient.cpp
diff --git a/camera/libhdrplusclient/HdrPlusClientUtils.cpp b/amber/camera/libhdrplusclient/HdrPlusClientUtils.cpp
index 1fb6838..1fb6838 100644
--- a/camera/libhdrplusclient/HdrPlusClientUtils.cpp
+++ b/amber/camera/libhdrplusclient/HdrPlusClientUtils.cpp
diff --git a/camera/libhdrplusclient/include/EaselManagerClient.h b/amber/camera/libhdrplusclient/include/EaselManagerClient.h
index 682cb67..682cb67 100644
--- a/camera/libhdrplusclient/include/EaselManagerClient.h
+++ b/amber/camera/libhdrplusclient/include/EaselManagerClient.h
diff --git a/camera/libhdrplusclient/include/HdrPlusClient.h b/amber/camera/libhdrplusclient/include/HdrPlusClient.h
index 31f7124..31f7124 100644
--- a/camera/libhdrplusclient/include/HdrPlusClient.h
+++ b/amber/camera/libhdrplusclient/include/HdrPlusClient.h
diff --git a/camera/libhdrplusclient/include/HdrPlusClientListener.h b/amber/camera/libhdrplusclient/include/HdrPlusClientListener.h
index 30b817e..30b817e 100644
--- a/camera/libhdrplusclient/include/HdrPlusClientListener.h
+++ b/amber/camera/libhdrplusclient/include/HdrPlusClientListener.h
diff --git a/camera/libhdrplusclient/include/HdrPlusClientUtils.h b/amber/camera/libhdrplusclient/include/HdrPlusClientUtils.h
index f9b126f..f9b126f 100644
--- a/camera/libhdrplusclient/include/HdrPlusClientUtils.h
+++ b/amber/camera/libhdrplusclient/include/HdrPlusClientUtils.h