diff --git a/Android.bp b/Android.bp
index 11b79ac..00b792f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,7 +25,7 @@
 
     resource_dirs: ["res"],
 
-    system_ext_specific: true,
+    product_specific: true,
 
     overrides: [
         "Gallery",
diff --git a/jni/Android.bp b/jni/Android.bp
index 3a70895..767d4af 100644
--- a/jni/Android.bp
+++ b/jni/Android.bp
@@ -4,7 +4,7 @@
 
 cc_defaults {
     name: "gallery2_jni_defaults",
-    system_ext_specific: true,
+    product_specific: true,
 
     cflags: [
         "-Wall",
diff --git a/jni_jpegstream/Android.bp b/jni_jpegstream/Android.bp
index dff6afd..a268674 100644
--- a/jni_jpegstream/Android.bp
+++ b/jni_jpegstream/Android.bp
@@ -5,7 +5,7 @@
 
 cc_library_shared {
     name: "libjni_gallery_jpegstream",
-    system_ext_specific: true,
+    product_specific: true,
 
     static_libs: ["libjpeg_static_ndk"],
     shared_libs: ["liblog"],