diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-12-24 08:25:45 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-12-24 08:25:45 +0000 |
commit | 61c2dbfd59f50d6b92b64a945eebff04a17bf61c (patch) | |
tree | 09bdff881457d334008cce93ac8b25b2cf2ddb86 | |
parent | 3cda17eb950797daada11fbd35e5e0f5cd1775c3 (diff) | |
parent | ac8e04c57938d8eaed6c2d965472375b1501063e (diff) | |
download | easel-61c2dbfd59f50d6b92b64a945eebff04a17bf61c.tar.gz |
Snap for 4517567 from ac8e04c57938d8eaed6c2d965472375b1501063e to pi-release
Change-Id: Ic9668af8f31afa3ffefb0104e2b8bd98dd10d69d
-rw-r--r-- | amber/camera/Android.bp | 26 | ||||
-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 |
11 files changed, 28 insertions, 2 deletions
diff --git a/amber/camera/Android.bp b/amber/camera/Android.bp new file mode 100644 index 0000000..d0d2dad --- /dev/null +++ b/amber/camera/Android.bp @@ -0,0 +1,26 @@ +/* + * Copyright 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +cc_library_headers { + name: "libhdrplusclient_headers", + proprietary: true, + owner: "google", + host_supported: false, + export_include_dirs: [ + "include", + "libhdrplusclient/include", + ], +} 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 |