graphics: remove duplicated types

Remove duplicated types from allocator@2.0 and composer@2.1.  Those types
are now in common@1.0.

Bug: 32238126
Test: builds and boots
Change-Id: Ibdb907e47969f5a5a98a14a2e2b77a9c5880beff

4 files changed, 4 insertions, 69 deletions

diff --git a/graphics/allocator/2.0/Android.bp b/graphics/allocator/2.0/Android.bp
index 004d7d27bb..cb37aa23ea 100644
--- a/graphics/allocator/2.0/Android.bp
+++ b/graphics/allocator/2.0/Android.bp
@@ -42,10 +42,12 @@ cc_library_shared {
         "libhwbinder",
         "libutils",
         "libcutils",
+        "android.hardware.graphics.common@1.0",
     ],
     export_shared_lib_headers: [
         "libhidl",
         "libhwbinder",
         "libutils",
+        "android.hardware.graphics.common@1.0",
     ],
 }
diff --git a/graphics/allocator/2.0/Android.mk b/graphics/allocator/2.0/Android.mk
deleted file mode 100644
index 3165fed5e7..0000000000
--- a/graphics/allocator/2.0/Android.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# This file is autogenerated by hidl-gen. Do not edit manually.
-
-LOCAL_PATH := $(call my-dir)
-
-################################################################################
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.graphics.allocator@2.0-java-constants
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-
-intermediates := $(local-generated-sources-dir)
-
-HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
-#
-GEN := $(intermediates)/android/hardware/graphics/allocator/2.0/Constants.java
-$(GEN): $(HIDL)
-$(GEN): $(LOCAL_PATH)/types.hal
-$(GEN): $(LOCAL_PATH)/IAllocator.hal
-
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-        -Ljava-constants -randroid.hardware:hardware/interfaces \
-        android.hardware.graphics.allocator@2.0
-
-$(GEN):
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-# Avoid dependency cycle of framework.jar -> this-library -> framework.jar
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core-oj
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/graphics/allocator/2.0/IAllocator.hal b/graphics/allocator/2.0/IAllocator.hal
index ff08a7edee..0464bcd046 100644
--- a/graphics/allocator/2.0/IAllocator.hal
+++ b/graphics/allocator/2.0/IAllocator.hal
@@ -16,6 +16,8 @@
 
 package android.hardware.graphics.allocator@2.0;
 
+import android.hardware.graphics.common@1.0::PixelFormat;
+
 interface IAllocator {
     enum Capability : int32_t {
         /* reserved */
diff --git a/graphics/allocator/2.0/types.hal b/graphics/allocator/2.0/types.hal
index 23b7345134..6081db9577 100644
--- a/graphics/allocator/2.0/types.hal
+++ b/graphics/allocator/2.0/types.hal
@@ -136,36 +136,5 @@ enum ConsumerUsage : uint64_t {
     /* bits 48-63 are reserved for vendor extensions */
 };
 
-/*
- * Copied from android_pixel_format_t.
- *
- * TODO(olv) copy comments as well and have android_pixel_format_t generated
- */
-@export(name="android_pixel_format", value_prefix="HAL_PIXEL_FORMAT_")
-enum PixelFormat : int32_t {
-    RGBA_8888              = 1,
-    RGBX_8888              = 2,
-    RGB_888                = 3,
-    RGB_565                = 4,
-    BGRA_8888              = 5,
-    YV12                   = 0x32315659,
-    Y8                     = 0x20203859,
-    Y16                    = 0x20363159,
-    RAW16                  = 0x20,
-    RAW10                  = 0x25,
-    RAW12                  = 0x26,
-    RAW_OPAQUE             = 0x24,
-    BLOB                   = 0x21,
-    IMPLEMENTATION_DEFINED = 0x22,
-    YCbCr_420_888          = 0x23,
-    YCbCr_422_888          = 0x27,
-    YCbCr_444_888          = 0x28,
-    FLEX_RGB_888           = 0x29,
-    FLEX_RGBA_8888         = 0x2A,
-    YCbCr_422_SP           = 0x10,
-    YCrCb_420_SP           = 0x11,
-    YCbCr_422_I            = 0x14,
-};
-
 typedef uint64_t BufferDescriptor;
 typedef uint64_t Buffer;