diff --git a/media/libstagefright/foundation/Android.bp b/media/libstagefright/foundation/Android.bp
index 027e593..dd1d904 100644
--- a/media/libstagefright/foundation/Android.bp
+++ b/media/libstagefright/foundation/Android.bp
@@ -4,8 +4,8 @@
     vendor_available: true,
 }
 
-cc_library {
-    name: "libstagefright_foundation",
+cc_defaults {
+    name: "libstagefright_foundation_defaults",
     vendor_available: true,
     vndk: {
         enabled: true,
@@ -88,39 +88,14 @@
     },
 }
 
+cc_library {
+    name: "libstagefright_foundation",
+    defaults: ["libstagefright_foundation_defaults"],
+}
+
 cc_library_static {
     name: "libstagefright_foundation_without_imemory",
-    vendor_available: true,
-    vndk: {
-        enabled: true,
-    },
-    double_loadable: true,
-    include_dirs: [
-        "frameworks/av/include",
-        "frameworks/native/include",
-        "frameworks/native/libs/arect/include",
-        "frameworks/native/libs/nativebase/include",
-    ],
-
-    local_include_dirs: [
-        "include/media/stagefright/foundation",
-    ],
-
-    header_libs: [
-        "libhardware_headers",
-        "libstagefright_foundation_headers",
-        "media_ndk_headers",
-        "media_plugin_headers",
-    ],
-
-    export_header_lib_headers: [
-        "libstagefright_foundation_headers",
-        "media_plugin_headers",
-    ],
-
-    export_shared_lib_headers: [
-        "libbinder",
-    ],
+    defaults: ["libstagefright_foundation_defaults"],
 
     cflags: [
         "-Wno-multichar",
@@ -128,47 +103,4 @@
         "-Wall",
         "-DNO_IMEMORY",
     ],
-
-    shared_libs: [
-        "libbinder",
-        "libutils",
-        "libcutils",
-        "liblog",
-    ],
-
-    srcs: [
-        "AAtomizer.cpp",
-        "ABitReader.cpp",
-        "ABuffer.cpp",
-        "ADebug.cpp",
-        "AHandler.cpp",
-        "ALooper.cpp",
-        "ALooperRoster.cpp",
-        "AMessage.cpp",
-        "AString.cpp",
-        "AStringUtils.cpp",
-        "AudioPresentationInfo.cpp",
-        "ByteUtils.cpp",
-        "ColorUtils.cpp",
-        "MediaBuffer.cpp",
-        "MediaBufferBase.cpp",
-        "MediaBufferGroup.cpp",
-        "MediaDefs.cpp",
-        "MediaKeys.cpp",
-        "MetaData.cpp",
-        "MetaDataBase.cpp",
-        "avc_utils.cpp",
-        "base64.cpp",
-        "hexdump.cpp",
-    ],
-
-    clang: true,
-
-    sanitize: {
-        misc_undefined: [
-            "unsigned-integer-overflow",
-            "signed-integer-overflow",
-        ],
-        cfi: true,
-    },
 }