commit ca5457074446917a75a16721cc8c9420512eb7e6
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Aug 03 20:38:21 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 03 20:38:21 2023 +0000
tree 2fd25f2c102c3896c74f6162ce33e07bf58f9952
parent 0c9b3f98dd3dd484c56ebc6fa378d37b1e1b7b01
parent 5fa8999d03bd9dea934dd9e2c425c6b131d96a96

Merge "Remove references to the pdk product variable" into main

camera/ndk/Android.bp

diff --git a/camera/ndk/Android.bp b/camera/ndk/Android.bp
index fef873b..e7d4680 100644
--- a/camera/ndk/Android.bp
+++ b/camera/ndk/Android.bp
@@ -166,11 +166,6 @@
     include_dirs: [
         "system/media/private/camera/include",
     ],
-    product_variables: {
-        pdk: {
-            enabled: false,
-        },
-    },
 }
 
 cc_test {

media/libstagefright/http/Android.bp

diff --git a/media/libstagefright/http/Android.bp b/media/libstagefright/http/Android.bp
index f25318d..4383d6f 100644
--- a/media/libstagefright/http/Android.bp
+++ b/media/libstagefright/http/Android.bp
@@ -37,10 +37,4 @@
         ],
         cfi: true,
     },
-
-    product_variables: {
-        pdk: {
-            enabled: false,
-        },
-    },
 }

media/ndk/Android.bp

diff --git a/media/ndk/Android.bp b/media/ndk/Android.bp
index fded4f5..8b9dde3 100644
--- a/media/ndk/Android.bp
+++ b/media/ndk/Android.bp
@@ -161,11 +161,6 @@
         "libgui",
     ],
 
-    product_variables: {
-        pdk: {
-            enabled: false,
-        },
-    },
     version_script: "libmediandk.map.txt",
     stubs: {
         symbol_file: "libmediandk.map.txt",