Snap for 6435660 from b1a31146d4f5db8c147178f97e04bef04cdcceb7 to sdk-releaseplatform-tools-30.0.1

Change-Id: I1a517266b3b5ee1377d769fb9843bceb235998be

5 files changed, 39 insertions, 6 deletions

diff --git a/build/hidl_interface.go b/build/hidl_interface.go
index b466c86a..1463d2d2 100644
--- a/build/hidl_interface.go
+++ b/build/hidl_interface.go
@@ -655,6 +655,7 @@ This corresponds to the "-r%s:<some path>" option that would be passed into hidl
 			}),
 			Export_generated_headers: []string{name.headersName()},
 			Apex_available:           i.properties.Apex_available,
+			Min_sdk_version:          getMinSdkVersion(name.string()),
 		}, &i.properties.VndkProperties)
 	}
 
@@ -935,6 +936,37 @@ func hidlInterfaceFactory() android.Module {
 	return i
 }
 
+var minSdkVersion = map[string]string{
+	"android.hardware.cas.native@1.0":           "29",
+	"android.hardware.cas@1.0":                  "29",
+	"android.hardware.graphics.allocator@2.0":   "29",
+	"android.hardware.graphics.allocator@3.0":   "29",
+	"android.hardware.graphics.bufferqueue@1.0": "29",
+	"android.hardware.graphics.bufferqueue@2.0": "29",
+	"android.hardware.graphics.common@1.0":      "29",
+	"android.hardware.graphics.common@1.1":      "29",
+	"android.hardware.graphics.common@1.2":      "29",
+	"android.hardware.graphics.mapper@2.0":      "29",
+	"android.hardware.graphics.mapper@2.1":      "29",
+	"android.hardware.graphics.mapper@3.0":      "29",
+	"android.hardware.media.bufferpool@2.0":     "29",
+	"android.hardware.media.c2@1.0":             "29",
+	"android.hardware.media.omx@1.0":            "29",
+	"android.hardware.media@1.0":                "29",
+	"android.hidl.allocator@1.0":                "29",
+	"android.hidl.memory.token@1.0":             "29",
+	"android.hidl.memory@1.0":                   "29",
+	"android.hidl.safe_union@1.0":               "29",
+	"android.hidl.token@1.0":                    "29",
+}
+
+func getMinSdkVersion(name string) *string {
+	if ver, ok := minSdkVersion[name]; ok {
+		return proptools.StringPtr(ver)
+	}
+	return nil
+}
+
 var doubleLoadablePackageNames = []string{
 	"android.frameworks.bufferhub@1.0",
 	"android.hardware.cas@1.0",
diff --git a/build/properties.go b/build/properties.go
index e945515b..b0b4b853 100644
--- a/build/properties.go
+++ b/build/properties.go
@@ -42,6 +42,7 @@ type ccProperties struct {
 	Double_loadable           *bool
 	Cflags                    []string
 	Apex_available            []string
+	Min_sdk_version           *string
 }
 
 type javaProperties struct {
diff --git a/hidl2aidl/test/Android.bp b/hidl2aidl/test/Android.bp
index 6ef676ba..7eff33f5 100644
--- a/hidl2aidl/test/Android.bp
+++ b/hidl2aidl/test/Android.bp
@@ -47,6 +47,7 @@ genrule {
 
 aidl_interface {
     name: "hidl2aidl_test_gen",
+    unstable: true,
     srcs: [":hidl2aidl_test_gen_aidl"],
 }
 
diff --git a/test/hidl_test/Android.bp b/test/hidl_test/Android.bp
index fcecd6d8..25e841cb 100644
--- a/test/hidl_test/Android.bp
+++ b/test/hidl_test/Android.bp
@@ -61,7 +61,7 @@ cc_test {
     srcs: [
         "hidl_test_client.cpp",
         "FooCallback.cpp",
-        "static_test.cpp"
+        "static_test.cpp",
     ],
 
     shared_libs: [
@@ -75,3 +75,7 @@ cc_test {
     srcs: ["hidl_test_servers.cpp"],
     gtest: false,
 }
+
+vts_config {
+    name: "VtsHidlUnitTests",
+}
diff --git a/test/hidl_test/Android.mk b/test/hidl_test/Android.mk
index e949ecd1..b5fdd5eb 100644
--- a/test/hidl_test/Android.mk
+++ b/test/hidl_test/Android.mk
@@ -41,8 +41,3 @@ LOCAL_REQUIRED_MODULES += hidl_test_client$(TARGET_2ND_ARCH_MODULE_SUFFIX)
 endif
 
 include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VtsHidlUnitTests
--include test/vts/tools/build/Android.host_config.mk