Merge "Convert external/libyuv to Android.bp"android-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-iot-preview-5android-n-iot-preview-4o-iot-preview-5n-iot-preview-4

4 files changed, 65 insertions, 72 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 00000000..515d5626
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1 @@
+subdirs = ["files"]
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 42e9e427..00000000
--- a/Android.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# libyuv
-include external/libyuv/files/Android.mk
diff --git a/files/Android.bp b/files/Android.bp
new file mode 100644
index 00000000..40ae158f
--- /dev/null
+++ b/files/Android.bp
@@ -0,0 +1,64 @@
+cc_library {
+    name: "libyuv",
+
+    srcs: [
+        "source/compare.cc",
+        "source/compare_common.cc",
+        "source/compare_gcc.cc",
+        "source/compare_neon.cc",
+        "source/compare_neon64.cc",
+        "source/convert.cc",
+        "source/convert_argb.cc",
+        "source/convert_from.cc",
+        "source/convert_from_argb.cc",
+        "source/convert_to_argb.cc",
+        "source/convert_to_i420.cc",
+        "source/cpu_id.cc",
+        "source/planar_functions.cc",
+        "source/rotate.cc",
+        "source/rotate_any.cc",
+        "source/rotate_argb.cc",
+        "source/rotate_common.cc",
+        "source/rotate_gcc.cc",
+        "source/rotate_mips.cc",
+        "source/rotate_neon.cc",
+        "source/rotate_neon64.cc",
+        "source/row_any.cc",
+        "source/row_common.cc",
+        "source/row_gcc.cc",
+        "source/row_mips.cc",
+        "source/row_neon.cc",
+        "source/row_neon64.cc",
+        "source/scale.cc",
+        "source/scale_any.cc",
+        "source/scale_argb.cc",
+        "source/scale_common.cc",
+        "source/scale_gcc.cc",
+        "source/scale_mips.cc",
+        "source/scale_neon.cc",
+        "source/scale_neon64.cc",
+        "source/video_common.cc",
+
+        "source/convert_jpeg.cc",
+        "source/mjpeg_decoder.cc",
+        "source/mjpeg_validate.cc",
+    ],
+
+    cflags: [
+        "-Wall",
+        "-Wno-unused-parameter",
+        "-fexceptions",
+        "-DHAVE_JPEG",
+    ],
+
+    shared_libs: ["libjpeg"],
+
+    export_include_dirs: ["include"],
+}
+
+// compatibilty static library until all uses of libyuv_static are replaced
+// with libyuv (b/37646797)
+cc_library_static {
+    name: "libyuv_static",
+    whole_static_libs: ["libyuv"],
+}
diff --git a/files/Android.mk b/files/Android.mk
deleted file mode 100644
index 86e65f6d..00000000
--- a/files/Android.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-# This is the Android makefile for libyuv for both platform and NDK.
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_CPP_EXTENSION := .cc
-
-LOCAL_SRC_FILES := \
-    source/compare.cc           \
-    source/compare_common.cc    \
-    source/compare_neon64.cc    \
-    source/compare_gcc.cc       \
-    source/convert.cc           \
-    source/convert_argb.cc      \
-    source/convert_from.cc      \
-    source/convert_from_argb.cc \
-    source/convert_to_argb.cc   \
-    source/convert_to_i420.cc   \
-    source/cpu_id.cc            \
-    source/planar_functions.cc  \
-    source/rotate.cc            \
-    source/rotate_any.cc        \
-    source/rotate_argb.cc       \
-    source/rotate_common.cc     \
-    source/rotate_mips.cc       \
-    source/rotate_neon64.cc     \
-    source/rotate_gcc.cc        \
-    source/row_any.cc           \
-    source/row_common.cc        \
-    source/row_mips.cc          \
-    source/row_neon64.cc        \
-    source/row_gcc.cc	          \
-    source/scale.cc             \
-    source/scale_any.cc         \
-    source/scale_argb.cc        \
-    source/scale_common.cc      \
-    source/scale_mips.cc        \
-    source/scale_neon64.cc      \
-    source/scale_gcc.cc         \
-    source/video_common.cc      \
-    source/compare_neon.cc      \
-    source/rotate_neon.cc       \
-    source/row_neon.cc          \
-    source/scale_neon.cc        \
-    source/mjpeg_decoder.cc     \
-    source/convert_jpeg.cc      \
-    source/mjpeg_validate.cc
-
-common_CFLAGS := -Wall -fexceptions -DHAVE_JPEG
-LOCAL_CFLAGS += $(common_CFLAGS)
-LOCAL_SHARED_LIBRARIES := libjpeg
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
-
-LOCAL_MODULE := libyuv_static
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_WHOLE_STATIC_LIBRARIES := libyuv_static
-LOCAL_MODULE := libyuv
-LOCAL_SHARED_LIBRARIES := libjpeg
-
-include $(BUILD_SHARED_LIBRARY)