restructure folders to avoid possible namespace collision

source files are restructured according to coding guidelines

1 files changed, 11 insertions, 11 deletions

diff --git a/Android.bp b/Android.bp
index d3cb33e..ce5f3a0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -36,15 +36,15 @@ cc_library {
     enabled: false,
     host_supported: true,
     vendor_available: true,
-    export_include_dirs: ["lib"],
-    local_include_dirs: ["lib"],
+    export_include_dirs: ["lib/include"],
+    local_include_dirs: ["lib/include"],
 
     srcs: [
-        "lib/icc.cpp",
-        "lib/jpegr.cpp",
-        "lib/gainmapmath.cpp",
-        "lib/jpegrutils.cpp",
-        "lib/multipictureformat.cpp",
+        "lib/src/icc.cpp",
+        "lib/src/jpegr.cpp",
+        "lib/src/gainmapmath.cpp",
+        "lib/src/jpegrutils.cpp",
+        "lib/src/multipictureformat.cpp",
     ],
 
     shared_libs: [
@@ -67,10 +67,10 @@ cc_library {
         "liblog",
     ],
 
-    export_include_dirs: ["lib"],
+    export_include_dirs: ["lib/include"],
 
     srcs: [
-        "lib/jpegencoderhelper.cpp",
+        "lib/src/jpegencoderhelper.cpp",
     ],
 }
 
@@ -85,9 +85,9 @@ cc_library {
         "liblog",
     ],
 
-    export_include_dirs: ["lib"],
+    export_include_dirs: ["lib/include"],
 
     srcs: [
-        "lib/jpegdecoderhelper.cpp",
+        "lib/src/jpegdecoderhelper.cpp",
     ],
 }