interfaces: change path [17/24]

PD# 157360

change path

Change-Id: If922b6cb5ed85d6e10721c3fe4dfc4f830ff2bec

11 files changed, 111 insertions, 61 deletions

diff --git a/Android.bp b/Android.bp
index d984933..d8461a7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,7 +1,7 @@
 // This is an autogenerated file, do not edit.
 subdirs = [
-    "systemcontrol/1.0",
-    "systemcontrol/1.0/vts/functional",
-    "hdmicec/1.0",
-    "droidvold/1.0",
+    "interfaces/systemcontrol/1.0",
+    "interfaces/systemcontrol/1.0/vts/functional",
+    "interfaces/hdmicec/1.0",
+    "interfaces/droidvold/1.0",
 ]
diff --git a/droidvold/1.0/Android.bp b/droidvold/1.0/Android.bp
index ed66c2e..2133e6f 100644
--- a/droidvold/1.0/Android.bp
+++ b/droidvold/1.0/Android.bp
@@ -12,7 +12,7 @@ filegroup {
 genrule {
     name: "vendor.amlogic.hardware.droidvold@1.0_genc++",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport -rvendor.amlogic.hardware:vendor/amlogic/interfaces vendor.amlogic.hardware.droidvold@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces vendor.amlogic.hardware.droidvold@1.0",
     srcs: [
         ":vendor.amlogic.hardware.droidvold@1.0_hal",
     ],
@@ -26,7 +26,7 @@ genrule {
 genrule {
     name: "vendor.amlogic.hardware.droidvold@1.0_genc++_headers",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport -rvendor.amlogic.hardware:vendor/amlogic/interfaces vendor.amlogic.hardware.droidvold@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces vendor.amlogic.hardware.droidvold@1.0",
     srcs: [
         ":vendor.amlogic.hardware.droidvold@1.0_hal",
     ],
@@ -46,13 +46,16 @@ genrule {
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "vendor.amlogic.hardware.droidvold@1.0",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["vendor.amlogic.hardware.droidvold@1.0_genc++"],
     generated_headers: ["vendor.amlogic.hardware.droidvold@1.0_genc++_headers"],
     export_generated_headers: ["vendor.amlogic.hardware.droidvold@1.0_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",
@@ -69,7 +72,7 @@ cc_library_shared {
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "vendor.amlogic.hardware.droidvold@1.0_vendor",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["vendor.amlogic.hardware.droidvold@1.0_genc++"],
diff --git a/droidvold/1.0/Android.mk b/droidvold/1.0/Android.mk
index 19ffff6..0859851 100644
--- a/droidvold/1.0/Android.mk
+++ b/droidvold/1.0/Android.mk
@@ -28,7 +28,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.droidvold@1.0::types.Result
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -51,7 +51,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.droidvold@1.0::IDroidVold
 
 $(GEN): $(LOCAL_PATH)/IDroidVold.hal
@@ -70,7 +70,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.droidvold@1.0::IDroidVoldCallback
 
 $(GEN): $(LOCAL_PATH)/IDroidVoldCallback.hal
@@ -105,7 +105,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.droidvold@1.0::types.Result
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -128,7 +128,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.droidvold@1.0::IDroidVold
 
 $(GEN): $(LOCAL_PATH)/IDroidVold.hal
@@ -147,7 +147,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.droidvold@1.0::IDroidVoldCallback
 
 $(GEN): $(LOCAL_PATH)/IDroidVoldCallback.hal
diff --git a/hdmicec/1.0/Android.bp b/hdmicec/1.0/Android.bp
index d813808..bf4ca30 100644
--- a/hdmicec/1.0/Android.bp
+++ b/hdmicec/1.0/Android.bp
@@ -12,7 +12,7 @@ filegroup {
 genrule {
     name: "vendor.amlogic.hardware.hdmicec@1.0_genc++",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport -rvendor.amlogic.hardware:vendor/amlogic/interfaces vendor.amlogic.hardware.hdmicec@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces vendor.amlogic.hardware.hdmicec@1.0",
     srcs: [
         ":vendor.amlogic.hardware.hdmicec@1.0_hal",
     ],
@@ -26,7 +26,7 @@ genrule {
 genrule {
     name: "vendor.amlogic.hardware.hdmicec@1.0_genc++_headers",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport -rvendor.amlogic.hardware:vendor/amlogic/interfaces vendor.amlogic.hardware.hdmicec@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces vendor.amlogic.hardware.hdmicec@1.0",
     srcs: [
         ":vendor.amlogic.hardware.hdmicec@1.0_hal",
     ],
@@ -46,13 +46,16 @@ genrule {
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "vendor.amlogic.hardware.hdmicec@1.0",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["vendor.amlogic.hardware.hdmicec@1.0_genc++"],
     generated_headers: ["vendor.amlogic.hardware.hdmicec@1.0_genc++_headers"],
     export_generated_headers: ["vendor.amlogic.hardware.hdmicec@1.0_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",
@@ -69,7 +72,7 @@ cc_library_shared {
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "vendor.amlogic.hardware.hdmicec@1.0_vendor",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["vendor.amlogic.hardware.hdmicec@1.0_genc++"],
diff --git a/hdmicec/1.0/Android.mk b/hdmicec/1.0/Android.mk
index 2b7cd9d..9a7af76 100644
--- a/hdmicec/1.0/Android.mk
+++ b/hdmicec/1.0/Android.mk
@@ -28,7 +28,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::types.CecEvent
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -47,7 +47,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::types.CecLogicalAddress
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -66,7 +66,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::types.CecMessage
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -74,6 +74,25 @@ $(GEN): $(LOCAL_PATH)/types.hal
 LOCAL_GENERATED_SOURCES += $(GEN)
 
 #
+# Build types.hal (ConnectType)
+#
+GEN := $(intermediates)/vendor/amlogic/hardware/hdmicec/V1_0/ConnectType.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+        -Ljava \
+        -randroid.hidl:system/libhidl/transport \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
+        vendor.amlogic.hardware.hdmicec@1.0::types.ConnectType
+
+$(GEN): $(LOCAL_PATH)/types.hal
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
 # Build types.hal (HdmiPortInfo)
 #
 GEN := $(intermediates)/vendor/amlogic/hardware/hdmicec/V1_0/HdmiPortInfo.java
@@ -85,7 +104,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::types.HdmiPortInfo
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -104,7 +123,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::types.HdmiPortType
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -123,7 +142,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::types.HotplugEvent
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -142,7 +161,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::types.OptionKey
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -161,7 +180,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::types.Result
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -180,7 +199,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::types.SendMessageResult
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -203,7 +222,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::IDroidHdmiCEC
 
 $(GEN): $(LOCAL_PATH)/IDroidHdmiCEC.hal
@@ -224,7 +243,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::IDroidHdmiCecCallback
 
 $(GEN): $(LOCAL_PATH)/IDroidHdmiCecCallback.hal
@@ -259,7 +278,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::types.CecEvent
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -278,7 +297,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::types.CecLogicalAddress
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -297,7 +316,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::types.CecMessage
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -305,6 +324,25 @@ $(GEN): $(LOCAL_PATH)/types.hal
 LOCAL_GENERATED_SOURCES += $(GEN)
 
 #
+# Build types.hal (ConnectType)
+#
+GEN := $(intermediates)/vendor/amlogic/hardware/hdmicec/V1_0/ConnectType.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+        -Ljava \
+        -randroid.hidl:system/libhidl/transport \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
+        vendor.amlogic.hardware.hdmicec@1.0::types.ConnectType
+
+$(GEN): $(LOCAL_PATH)/types.hal
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
 # Build types.hal (HdmiPortInfo)
 #
 GEN := $(intermediates)/vendor/amlogic/hardware/hdmicec/V1_0/HdmiPortInfo.java
@@ -316,7 +354,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::types.HdmiPortInfo
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -335,7 +373,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::types.HdmiPortType
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -354,7 +392,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::types.HotplugEvent
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -373,7 +411,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::types.OptionKey
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -392,7 +430,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::types.Result
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -411,7 +449,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::types.SendMessageResult
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -434,7 +472,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::IDroidHdmiCEC
 
 $(GEN): $(LOCAL_PATH)/IDroidHdmiCEC.hal
@@ -455,7 +493,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.hdmicec@1.0::IDroidHdmiCecCallback
 
 $(GEN): $(LOCAL_PATH)/IDroidHdmiCecCallback.hal
diff --git a/systemcontrol/1.0/Android.bp b/systemcontrol/1.0/Android.bp
index c8999a0..353a20e 100644
--- a/systemcontrol/1.0/Android.bp
+++ b/systemcontrol/1.0/Android.bp
@@ -12,7 +12,7 @@ filegroup {
 genrule {
     name: "vendor.amlogic.hardware.systemcontrol@1.0_genc++",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport -rvendor.amlogic.hardware:vendor/amlogic/interfaces vendor.amlogic.hardware.systemcontrol@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces vendor.amlogic.hardware.systemcontrol@1.0",
     srcs: [
         ":vendor.amlogic.hardware.systemcontrol@1.0_hal",
     ],
@@ -26,7 +26,7 @@ genrule {
 genrule {
     name: "vendor.amlogic.hardware.systemcontrol@1.0_genc++_headers",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport -rvendor.amlogic.hardware:vendor/amlogic/interfaces vendor.amlogic.hardware.systemcontrol@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces vendor.amlogic.hardware.systemcontrol@1.0",
     srcs: [
         ":vendor.amlogic.hardware.systemcontrol@1.0_hal",
     ],
@@ -46,13 +46,16 @@ genrule {
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "vendor.amlogic.hardware.systemcontrol@1.0",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["vendor.amlogic.hardware.systemcontrol@1.0_genc++"],
     generated_headers: ["vendor.amlogic.hardware.systemcontrol@1.0_genc++_headers"],
     export_generated_headers: ["vendor.amlogic.hardware.systemcontrol@1.0_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",
@@ -69,7 +72,7 @@ cc_library_shared {
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "vendor.amlogic.hardware.systemcontrol@1.0_vendor",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["vendor.amlogic.hardware.systemcontrol@1.0_genc++"],
diff --git a/systemcontrol/1.0/Android.mk b/systemcontrol/1.0/Android.mk
index 64b7859..ba3246a 100644
--- a/systemcontrol/1.0/Android.mk
+++ b/systemcontrol/1.0/Android.mk
@@ -28,7 +28,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.systemcontrol@1.0::types.DroidDisplayInfo
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -47,7 +47,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.systemcontrol@1.0::types.Result
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -70,7 +70,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.systemcontrol@1.0::ISystemControl
 
 $(GEN): $(LOCAL_PATH)/ISystemControl.hal
@@ -89,7 +89,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.systemcontrol@1.0::ISystemControlCallback
 
 $(GEN): $(LOCAL_PATH)/ISystemControlCallback.hal
@@ -124,7 +124,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.systemcontrol@1.0::types.DroidDisplayInfo
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -143,7 +143,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.systemcontrol@1.0::types.Result
 
 $(GEN): $(LOCAL_PATH)/types.hal
@@ -166,7 +166,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.systemcontrol@1.0::ISystemControl
 
 $(GEN): $(LOCAL_PATH)/ISystemControl.hal
@@ -185,7 +185,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.systemcontrol@1.0::ISystemControlCallback
 
 $(GEN): $(LOCAL_PATH)/ISystemControlCallback.hal
diff --git a/test/1.0/Android.bp b/test/1.0/Android.bp
index 7e14607..649b07e 100644
--- a/test/1.0/Android.bp
+++ b/test/1.0/Android.bp
@@ -10,7 +10,7 @@ filegroup {
 genrule {
     name: "vendor.amlogic.hardware.test@1.0_genc++",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport -rvendor.amlogic.hardware:vendor/amlogic/interfaces vendor.amlogic.hardware.test@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces vendor.amlogic.hardware.test@1.0",
     srcs: [
         ":vendor.amlogic.hardware.test@1.0_hal",
     ],
@@ -22,7 +22,7 @@ genrule {
 genrule {
     name: "vendor.amlogic.hardware.test@1.0_genc++_headers",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport -rvendor.amlogic.hardware:vendor/amlogic/interfaces vendor.amlogic.hardware.test@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces vendor.amlogic.hardware.test@1.0",
     srcs: [
         ":vendor.amlogic.hardware.test@1.0_hal",
     ],
@@ -35,13 +35,16 @@ genrule {
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "vendor.amlogic.hardware.test@1.0",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["vendor.amlogic.hardware.test@1.0_genc++"],
     generated_headers: ["vendor.amlogic.hardware.test@1.0_genc++_headers"],
     export_generated_headers: ["vendor.amlogic.hardware.test@1.0_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",
@@ -58,7 +61,7 @@ cc_library_shared {
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "vendor.amlogic.hardware.test@1.0_vendor",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["vendor.amlogic.hardware.test@1.0_genc++"],
diff --git a/test/1.0/Android.mk b/test/1.0/Android.mk
index 6a13a7f..48226ce 100644
--- a/test/1.0/Android.mk
+++ b/test/1.0/Android.mk
@@ -28,7 +28,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.test@1.0::IVendorTest
 
 $(GEN): $(LOCAL_PATH)/IVendorTest.hal
@@ -63,7 +63,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -rvendor.amlogic.hardware:vendor/amlogic/interfaces \
+        -rvendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
         vendor.amlogic.hardware.test@1.0::IVendorTest
 
 $(GEN): $(LOCAL_PATH)/IVendorTest.hal
diff --git a/update-base.sh b/update-base.sh
index 882083c..c205f97 100755
--- a/update-base.sh
+++ b/update-base.sh
@@ -4,7 +4,7 @@
 # It should typically be created elsewhere.
 
 options="-Lexport-header \
-         -r vendor.amlogic.hardware:vendor/amlogic/interfaces \
+         -r vendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
          -r android.hidl:system/libhidl/transport\
          -r android.hardware:hardware/interfaces"
 
diff --git a/update-makefiles.sh b/update-makefiles.sh
index a26d62d..a9cac59 100755
--- a/update-makefiles.sh
+++ b/update-makefiles.sh
@@ -3,11 +3,11 @@
 source system/tools/hidl/update-makefiles-helper.sh
 
 do_makefiles_update \
-  "vendor.amlogic.hardware:vendor/amlogic/interfaces" \
+  "vendor.amlogic.hardware:vendor/amlogic/ampere/interfaces" \
   "android.hidl:system/libhidl/transport" \
   "android.hardware:hardware/interfaces"
   
-#options="-r vendor.amlogic.hardware:vendor/amlogic/interfaces \
+#options="-r vendor.amlogic.hardware:vendor/amlogic/ampere/interfaces \
 #         -r android.hidl:system/libhidl/transport \
 #         -r android.hardware:hardware/interfaces"