Snap for 11819063 from fd2e21c66a387fb8b9a8fe5a98161522eb173f29 to sdk-releasesdk-release

Change-Id: I0ace9cb11add6bfcbec58081bd79d22c0a3a3b27

21 files changed, 192 insertions, 247 deletions

diff --git a/Android.mk b/Android.mk
index 6ab1d7d6..943da933 100644
--- a/Android.mk
+++ b/Android.mk
@@ -143,14 +143,6 @@ ifneq (true,$(GOLDFISH_OPENGL_BUILD_FOR_HOST))
 include $(GOLDFISH_OPENGL_PATH)/system/hals/Android.mk
 endif
 
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 28 -o $(IS_AT_LEAST_QPR1) = true && echo isApi29OrHigher),isApi29OrHigher)
-    # hardware codecs enabled after P
-    include $(GOLDFISH_OPENGL_PATH)/system/codecs/omx/common/Android.mk
-    include $(GOLDFISH_OPENGL_PATH)/system/codecs/omx/plugin/Android.mk
-    include $(GOLDFISH_OPENGL_PATH)/system/codecs/omx/avcdec/Android.mk
-    include $(GOLDFISH_OPENGL_PATH)/system/codecs/omx/vpxdec/Android.mk
-endif
-
 endif
 
 endif # ENABLE_GOLDFISH_OPENGL_FOLDER
diff --git a/system/codecs/Android.mk b/system/codecs/Android.mk
deleted file mode 100644
index 5053e7d6..00000000
--- a/system/codecs/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-include $(call all-subdir-makefiles)
diff --git a/system/codecs/omx/Android.mk b/system/codecs/omx/Android.mk
deleted file mode 100644
index c307f8eb..00000000
--- a/system/codecs/omx/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright 2018 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.
-#
-include $(call all-subdir-makefiles)
diff --git a/system/codecs/omx/avcdec/Android.bp b/system/codecs/omx/avcdec/Android.bp
new file mode 100644
index 00000000..2fc1c2f3
--- /dev/null
+++ b/system/codecs/omx/avcdec/Android.bp
@@ -0,0 +1,53 @@
+//
+// Copyright 2019 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_shared {
+    name: "libstagefright_goldfish_avcdec",
+    vendor: true,
+    srcs: [
+        "GoldfishAVCDec.cpp",
+        "MediaH264Decoder.cpp",
+    ],
+    export_include_dirs: [
+        "include",
+    ],
+    shared_libs: [
+        "libstagefrighthw",
+        "android.hardware.media.omx@1.0",
+        "android.hardware.graphics.common@1.2",
+        "libstagefright_foundation",
+        "libbase",
+        "libbinder",
+        "libcutils",
+        "liblog",
+        "libui",
+        "libutils",
+    ],
+    static_libs: [
+        "libgoldfish_codecs_common",
+    ],
+    header_libs: [
+        "media_plugin_headers",
+        "libmedia_headers",
+        "libnativewindow_headers",
+        "libhardware_headers",
+        "libgralloc_cb.ranchu",
+    ],
+    cflags: [
+        "-DLOG_TAG=\"goldfish_avcdec\"",
+        "-Wno-unused-private-field",
+    ],
+}
diff --git a/system/codecs/omx/avcdec/Android.mk b/system/codecs/omx/avcdec/Android.mk
deleted file mode 100644
index 4ab6db3d..00000000
--- a/system/codecs/omx/avcdec/Android.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright 2019 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.
-#
-LOCAL_PATH := $(call my-dir)
-
-commonSources := \
-        GoldfishAVCDec.cpp  \
-        MediaH264Decoder.cpp
-
-$(call emugl-begin-shared-library,libstagefright_goldfish_avcdec$(GOLDFISH_OPENGL_LIB_SUFFIX))
-
-LOCAL_SRC_FILES := $(commonSources)
-
-LOCAL_CFLAGS += -DLOG_TAG=\"goldfish_avcdec\"
-LOCAL_CFLAGS += -Wno-unused-private-field
-
-$(call emugl-export,SHARED_LIBRARIES,libcutils libutils liblog)
-
-LOCAL_HEADER_LIBRARIES := media_plugin_headers \
-                          libmedia_headers \
-                          libbinder_headers \
-                          libhidlbase_impl_internal \
-                          libbase
-LOCAL_HEADER_LIBRARIES += libui_headers \
-                          libnativewindow_headers \
-                          libhardware_headers \
-                          libarect_headers \
-                          libarect_headers_for_ndk
-LOCAL_SHARED_LIBRARIES :=       \
-        libbinder               \
-        libutils                \
-        liblog                  \
-        libcutils               \
-        libui \
-        android.hardware.media.omx@1.0 \
-	    android.hardware.graphics.allocator@3.0 \
-		android.hardware.graphics.mapper@3.0 \
-        libstagefright_foundation
-
-LOCAL_HEADER_LIBRARIES += libgralloc_cb.ranchu
-
-$(call emugl-export,C_INCLUDES,$(LOCAL_PATH))
-$(call emugl-import,libgoldfish_codecs_common)
-$(call emugl-import,libstagefrighthw)
-$(call emugl-end-module)
diff --git a/system/codecs/omx/avcdec/GoldfishAVCDec.cpp b/system/codecs/omx/avcdec/GoldfishAVCDec.cpp
index 02c0dc16..a49d7e89 100644
--- a/system/codecs/omx/avcdec/GoldfishAVCDec.cpp
+++ b/system/codecs/omx/avcdec/GoldfishAVCDec.cpp
@@ -33,8 +33,7 @@
 
 #include <nativebase/nativebase.h>
 
-#include <android/hardware/graphics/allocator/3.0/IAllocator.h>
-#include <android/hardware/graphics/mapper/3.0/IMapper.h>
+#include <android/hardware/graphics/common/1.2/types.h>
 #include <hidl/LegacySupport.h>
 
 using ::android::hardware::graphics::common::V1_2::PixelFormat;
diff --git a/system/codecs/omx/avcdec/GoldfishAVCDec.h b/system/codecs/omx/avcdec/include/GoldfishAVCDec.h
index 0fd52b0d..0fd52b0d 100644
--- a/system/codecs/omx/avcdec/GoldfishAVCDec.h
+++ b/system/codecs/omx/avcdec/include/GoldfishAVCDec.h
diff --git a/system/codecs/omx/avcdec/MediaH264Decoder.h b/system/codecs/omx/avcdec/include/MediaH264Decoder.h
index a75758fa..a75758fa 100644
--- a/system/codecs/omx/avcdec/MediaH264Decoder.h
+++ b/system/codecs/omx/avcdec/include/MediaH264Decoder.h
diff --git a/system/codecs/omx/common/Android.bp b/system/codecs/omx/common/Android.bp
new file mode 100644
index 00000000..7a7f7270
--- /dev/null
+++ b/system/codecs/omx/common/Android.bp
@@ -0,0 +1,41 @@
+//
+// Copyright 2020 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_static {
+    name: "libgoldfish_codecs_common",
+    vendor: true,
+    srcs: [
+        "goldfish_media_utils.cpp",
+    ],
+    shared_libs: [
+        "libcutils",
+        "libutils",
+        "liblog",
+    ],
+    static_libs: [
+        "libGoldfishAddressSpace",
+    ],
+    whole_static_libs: [
+        "libGoldfishAddressSpace",
+    ],
+    export_include_dirs: [
+        "include",
+    ],
+    cflags: [
+        "-DLOG_TAG=\"goldfish_codecs_common\"",
+        "-Wno-unused-private-field",
+    ],
+}
diff --git a/system/codecs/omx/common/Android.mk b/system/codecs/omx/common/Android.mk
deleted file mode 100644
index 6b1674c9..00000000
--- a/system/codecs/omx/common/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright 2019 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.
-#
-LOCAL_PATH := $(call my-dir)
-
-commonSources := \
-        goldfish_media_utils.cpp
-
-$(call emugl-begin-shared-library,libgoldfish_codecs_common$(GOLDFISH_OPENGL_LIB_SUFFIX))
-
-LOCAL_SRC_FILES := $(commonSources)
-
-LOCAL_CFLAGS += -DLOG_TAG=\"goldfish_codecs_common\"
-LOCAL_CFLAGS += -Wno-unused-private-field
-
-$(call emugl-export,SHARED_LIBRARIES,libcutils libutils liblog)
-
-$(call emugl-export,C_INCLUDES,$(LOCAL_PATH))
-
-ifeq (true,$(GOLDFISH_OPENGL_BUILD_FOR_HOST))
-$(call emugl-import,libGoldfishAddressSpace$(GOLDFISH_OPENGL_LIB_SUFFIX))
-else
-$(call emugl-export,STATIC_LIBRARIES,libplatform)
-$(call emugl-export,STATIC_LIBRARIES,libGoldfishAddressSpace)
-
-ifeq (true,$(GFXSTREAM))
-
-LOCAL_CFLAGS += -DVIRTIO_GPU
-LOCAL_C_INCLUDES += external/libdrm external/minigbm/cros_gralloc
-LOCAL_SHARED_LIBRARIES += libdrm
-
-endif
-
-endif
-
-$(call emugl-end-module)
diff --git a/system/codecs/omx/common/goldfish_media_utils.h b/system/codecs/omx/common/include/goldfish_media_utils.h
index d25ee301..d25ee301 100644
--- a/system/codecs/omx/common/goldfish_media_utils.h
+++ b/system/codecs/omx/common/include/goldfish_media_utils.h
diff --git a/system/codecs/omx/plugin/Android.bp b/system/codecs/omx/plugin/Android.bp
new file mode 100644
index 00000000..bd0bb18d
--- /dev/null
+++ b/system/codecs/omx/plugin/Android.bp
@@ -0,0 +1,44 @@
+//
+// Copyright 2018 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_shared {
+    name: "libstagefrighthw",
+    vendor: true,
+    srcs: [
+        "GoldfishOMXComponent.cpp",
+        "GoldfishOMXPlugin.cpp",
+        "GoldfishVideoDecoderOMXComponent.cpp",
+        "SimpleGoldfishOMXComponent.cpp",
+    ],
+    export_include_dirs: [
+        "include",
+    ],
+    shared_libs: [
+        "android.hardware.media.omx@1.0",
+        "libstagefright_foundation",
+        "libbase",
+        "libcutils",
+        "liblog",
+        "libutils",
+    ],
+    header_libs: [
+        "libmedia_headers",
+    ],
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+}
diff --git a/system/codecs/omx/plugin/Android.mk b/system/codecs/omx/plugin/Android.mk
deleted file mode 100644
index 4adfd8a8..00000000
--- a/system/codecs/omx/plugin/Android.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Copyright 2018 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.
-#
-LOCAL_PATH := $(call my-dir)
-
-commonSources := \
-    GoldfishOMXComponent.cpp \
-    GoldfishOMXPlugin.cpp \
-    GoldfishVideoDecoderOMXComponent.cpp \
-    SimpleGoldfishOMXComponent.cpp \
-
-$(call emugl-begin-shared-library,libstagefrighthw$(GOLDFISH_OPENGL_LIB_SUFFIX))
-
-LOCAL_SRC_FILES := $(commonSources)
-
-LOCAL_CFLAGS += $(PV_CFLAGS_MINUS_VISIBILITY) -Werror
-LOCAL_CFLAGS += -Wno-unused-private-field
-
-LOCAL_C_INCLUDES += \
-        $(call include-path-for, frameworks-native)/media/hardware \
-        $(call include-path-for, frameworks-native)/media/openmax \
-
-$(call emugl-export,SHARED_LIBRARIES,libcutils libutils liblog)
-$(call emugl-export,C_INCLUDES,$(LOCAL_PATH))
-
-LOCAL_HEADER_LIBRARIES += media_plugin_headers \
-	                      libmedia_headers \
-	                      libbinder_headers \
-	                      libhidlbase_impl_internal \
-	                      libbase
-
-LOCAL_SHARED_LIBRARIES +=       \
-        libbinder               \
-        libutils                \
-        liblog                  \
-        libcutils               \
-        android.hardware.media.omx@1.0 \
-        libstagefright_foundation
-
-LOCAL_VENDOR_MODULE := true
-
-$(call emugl-end-module)
diff --git a/system/codecs/omx/plugin/GoldfishOMXComponent.h b/system/codecs/omx/plugin/include/GoldfishOMXComponent.h
index 87a65ae3..87a65ae3 100644
--- a/system/codecs/omx/plugin/GoldfishOMXComponent.h
+++ b/system/codecs/omx/plugin/include/GoldfishOMXComponent.h
diff --git a/system/codecs/omx/plugin/GoldfishVideoDecoderOMXComponent.h b/system/codecs/omx/plugin/include/GoldfishVideoDecoderOMXComponent.h
index bf60f615..bf60f615 100644
--- a/system/codecs/omx/plugin/GoldfishVideoDecoderOMXComponent.h
+++ b/system/codecs/omx/plugin/include/GoldfishVideoDecoderOMXComponent.h
diff --git a/system/codecs/omx/plugin/SimpleGoldfishOMXComponent.h b/system/codecs/omx/plugin/include/SimpleGoldfishOMXComponent.h
index d2a3bf5d..d2a3bf5d 100644
--- a/system/codecs/omx/plugin/SimpleGoldfishOMXComponent.h
+++ b/system/codecs/omx/plugin/include/SimpleGoldfishOMXComponent.h
diff --git a/system/codecs/omx/vpxdec/Android.bp b/system/codecs/omx/vpxdec/Android.bp
new file mode 100644
index 00000000..09a7f9cc
--- /dev/null
+++ b/system/codecs/omx/vpxdec/Android.bp
@@ -0,0 +1,52 @@
+//
+// Copyright 2018 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_shared {
+    name: "libstagefright_goldfish_vpxdec",
+    vendor: true,
+    srcs: [
+        "GoldfishVPX.cpp",
+        "goldfish_vpx_impl.cpp",
+    ],
+    export_include_dirs: [
+        "include",
+    ],
+    shared_libs: [
+        "libstagefrighthw",
+        "android.hardware.media.omx@1.0",
+        "android.hardware.graphics.common@1.2",
+        "libstagefright_foundation",
+        "libbinder",
+        "libcutils",
+        "libutils",
+        "liblog",
+        "libui",
+    ],
+    static_libs: [
+        "libgoldfish_codecs_common",
+    ],
+    header_libs: [
+        "media_plugin_headers",
+        "libmedia_headers",
+        "libbinder_headers",
+        "libhardware_headers",
+        "libnativewindow_headers",
+        "libgralloc_cb.ranchu",
+    ],
+    cflags: [
+        "-DLOG_TAG=\"goldfish_vpxdec\"",
+    ],
+}
diff --git a/system/codecs/omx/vpxdec/Android.mk b/system/codecs/omx/vpxdec/Android.mk
deleted file mode 100644
index e7ec2d4f..00000000
--- a/system/codecs/omx/vpxdec/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Copyright 2019 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.
-#
-LOCAL_PATH := $(call my-dir)
-
-commonSources := \
-        GoldfishVPX.cpp  \
-        goldfish_vpx_impl.cpp
-
-$(call emugl-begin-shared-library,libstagefright_goldfish_vpxdec$(GOLDFISH_OPENGL_LIB_SUFFIX))
-
-LOCAL_SRC_FILES := $(commonSources)
-
-LOCAL_CFLAGS += -DLOG_TAG=\"goldfish_vpxdec\"
-LOCAL_CFLAGS += -Wno-unused-private-field
-
-$(call emugl-export,SHARED_LIBRARIES,libcutils libutils liblog)
-
-LOCAL_HEADER_LIBRARIES := media_plugin_headers \
-	                      libmedia_headers \
-	                      libbinder_headers \
-	                      libhidlbase_impl_internal \
-	                      libbase
-
-LOCAL_HEADER_LIBRARIES += libui_headers \
-                          libnativewindow_headers \
-                          libhardware_headers \
-                          libarect_headers \
-                          libarect_headers_for_ndk
-
-LOCAL_HEADER_LIBRARIES += libgralloc_cb.ranchu
-
-LOCAL_SHARED_LIBRARIES +=       \
-        libbinder               \
-        libutils                \
-        liblog                  \
-        libcutils               \
-        libui                   \
-        android.hardware.media.omx@1.0 \
-        android.hardware.graphics.allocator@3.0 \
-        android.hardware.graphics.mapper@3.0 \
-        libstagefright_foundation
-
-$(call emugl-export,C_INCLUDES,$(LOCAL_PATH))
-$(call emugl-import,libgoldfish_codecs_common)
-$(call emugl-import,libstagefrighthw)
-$(call emugl-end-module)
diff --git a/system/codecs/omx/vpxdec/GoldfishVPX.cpp b/system/codecs/omx/vpxdec/GoldfishVPX.cpp
index edf6aa3f..2a6e4bcf 100644
--- a/system/codecs/omx/vpxdec/GoldfishVPX.cpp
+++ b/system/codecs/omx/vpxdec/GoldfishVPX.cpp
@@ -36,8 +36,7 @@
 
 #include <nativebase/nativebase.h>
 
-#include <android/hardware/graphics/allocator/3.0/IAllocator.h>
-#include <android/hardware/graphics/mapper/3.0/IMapper.h>
+#include <android/hardware/graphics/common/1.2/types.h>
 #include <hidl/LegacySupport.h>
 
 using ::android::hardware::graphics::common::V1_0::BufferUsage;
diff --git a/system/codecs/omx/vpxdec/GoldfishVPX.h b/system/codecs/omx/vpxdec/include/GoldfishVPX.h
index cb9321f5..cb9321f5 100644
--- a/system/codecs/omx/vpxdec/GoldfishVPX.h
+++ b/system/codecs/omx/vpxdec/include/GoldfishVPX.h
diff --git a/system/codecs/omx/vpxdec/goldfish_vpx_defs.h b/system/codecs/omx/vpxdec/include/goldfish_vpx_defs.h
index 25fecde3..25fecde3 100644
--- a/system/codecs/omx/vpxdec/goldfish_vpx_defs.h
+++ b/system/codecs/omx/vpxdec/include/goldfish_vpx_defs.h