release-request-d642586e-3e25-49f4-8b4c-acad0e3f63d8-for-git_oc-mr1-release-4249777 snap-temp-L81500000089724408android-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-release

Change-Id: Ie4576ab7c66833269e1bbe935205b934df2d1a31

4 files changed, 16 insertions, 4 deletions

diff --git a/displayservice/1.0/Android.bp b/displayservice/1.0/Android.bp
index 7d000f8..d073631 100644
--- a/displayservice/1.0/Android.bp
+++ b/displayservice/1.0/Android.bp
@@ -53,13 +53,16 @@ genrule {
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "android.frameworks.displayservice@1.0",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["android.frameworks.displayservice@1.0_genc++"],
     generated_headers: ["android.frameworks.displayservice@1.0_genc++_headers"],
     export_generated_headers: ["android.frameworks.displayservice@1.0_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",
diff --git a/schedulerservice/1.0/Android.bp b/schedulerservice/1.0/Android.bp
index 43ee5f3..ba75f9b 100644
--- a/schedulerservice/1.0/Android.bp
+++ b/schedulerservice/1.0/Android.bp
@@ -35,13 +35,16 @@ genrule {
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "android.frameworks.schedulerservice@1.0",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["android.frameworks.schedulerservice@1.0_genc++"],
     generated_headers: ["android.frameworks.schedulerservice@1.0_genc++_headers"],
     export_generated_headers: ["android.frameworks.schedulerservice@1.0_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",
diff --git a/sensorservice/1.0/Android.bp b/sensorservice/1.0/Android.bp
index 4451f84..5e3ba38 100644
--- a/sensorservice/1.0/Android.bp
+++ b/sensorservice/1.0/Android.bp
@@ -60,13 +60,16 @@ genrule {
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "android.frameworks.sensorservice@1.0",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["android.frameworks.sensorservice@1.0_genc++"],
     generated_headers: ["android.frameworks.sensorservice@1.0_genc++_headers"],
     export_generated_headers: ["android.frameworks.sensorservice@1.0_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",
diff --git a/vr/composer/1.0/Android.bp b/vr/composer/1.0/Android.bp
index d2e32c3..8479c00 100644
--- a/vr/composer/1.0/Android.bp
+++ b/vr/composer/1.0/Android.bp
@@ -35,13 +35,16 @@ genrule {
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "android.frameworks.vr.composer@1.0",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["android.frameworks.vr.composer@1.0_genc++"],
     generated_headers: ["android.frameworks.vr.composer@1.0_genc++_headers"],
     export_generated_headers: ["android.frameworks.vr.composer@1.0_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",