op3: Clean up extra camera parameters

Change-Id: Ie1e73e5a47917321076c7b59edecb869e4c81307
AICP · Nov 18, 2016 · 66b50dc · 66b50dc
1 parent 70d938f
commit 66b50dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/camera/camera_shim.cpp b/camera/camera_shim.cpp
@@ -18,7 +18,6 @@
 #include <string>
 
 const char *_ZN7android18gClientPackageNameE;
-const char *_ZN7android16CameraParameters31KEY_SUPPORTED_VIDEO_SIZES_60FPSE = "support-60fps-video-sizes";
 
 extern "C" {
 
@@ -42,4 +41,3 @@ extern "C" void _ZN7android13GraphicBufferC1Ejjij(
   _ZN7android13GraphicBufferC1EjjijNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE(
       inWidth, inHeight, inFormat, inUsage, requestorName);
 }
-
diff --git a/include/camera/CameraParametersExtra.h b/include/camera/CameraParametersExtra.h
@@ -15,7 +15,9 @@
  */
 
 #define CAMERA_PARAMETERS_EXTRA_C \
-const char CameraParameters::CLIENT_PACKAGE_NAME[] = "client-package-name";
+    const char CameraParameters::CLIENT_PACKAGE_NAME[] = "client-package-name"; \
+    const char CameraParameters::KEY_SUPPORTED_VIDEO_SIZES_60FPS[] = "support-60fps-video-sizes";
 
 #define CAMERA_PARAMETERS_EXTRA_H \
-    static const char CLIENT_PACKAGE_NAME[];
+    static const char CLIENT_PACKAGE_NAME[]; \
+    static const char KEY_SUPPORTED_VIDEO_SIZES_60FPS[];