Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb1b8e4a authored by Dongwon Kang's avatar Dongwon Kang Committed by Android (Google) Code Review
Browse files

Merge "Revert "Install extractors for 1st and 2nd ABIs to the test APEX"" into qt-dev

parents 2112c916 8bd93d3c

apex/Android.bp

+18 −19
Original line number Original line Diff line number Diff line
@@ -12,7 +12,14 @@ 
// See the License for the specific language governing permissions and

// See the License for the specific language governing permissions and

// limitations under the License.

// limitations under the License.





com_android_media_extractors = [

apex_defaults {

    name: "com.android.media-defaults",

    java_libs: ["updatable-media"],

    multilib: {

        first: {

            // Extractor process runs only with the primary ABI.

            native_shared_libs: [

                // Extractor plugins

                "libaacextractor",

                "libaacextractor",

                "libamrextractor",

                "libamrextractor",

                "libflacextractor",

                "libflacextractor",
@@ -23,11 +30,9 @@ com_android_media_extractors = [ 
                "libmpeg2extractor",

                "libmpeg2extractor",

                "liboggextractor",

                "liboggextractor",

                "libwavextractor",

                "libwavextractor",

]

            ],



        },

apex_defaults {

    },

    name: "com.android.media-defaults",

    java_libs: ["updatable-media"],

    key: "com.android.media.key",

    key: "com.android.media.key",

    certificate: ":com.android.media.certificate",

    certificate: ":com.android.media.certificate",
@@ -39,12 +44,6 @@ apex { 
    name: "com.android.media",

    name: "com.android.media",

    manifest: "manifest.json",

    manifest: "manifest.json",

    defaults: ["com.android.media-defaults"],

    defaults: ["com.android.media-defaults"],

    multilib: {

        first: {

            // Extractor process runs only with the primary ABI.

            native_shared_libs: com_android_media_extractors,

        },

    },

}

}





filegroup {

filegroup {

apex/testing/Android.bp

+0 −7
Original line number Original line Diff line number Diff line
@@ -17,13 +17,6 @@ apex { 
    manifest: "test_manifest.json",

    manifest: "test_manifest.json",

    file_contexts: "com.android.media",

    file_contexts: "com.android.media",

    defaults: ["com.android.media-defaults"],

    defaults: ["com.android.media-defaults"],

    multilib: {

        both: {

            // for test apex, built for both ABIs

            native_shared_libs: com_android_media_extractors,

        },

    },

    compile_multilib: "both",

    installable: false,

    installable: false,

}

}

media/extractors/aac/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ cc_library_shared { 
    name: "libaacextractor",

    name: "libaacextractor",

    relative_install_path: "extractors",

    relative_install_path: "extractors",





    compile_multilib: "both",

    compile_multilib: "first",





    cflags: [

    cflags: [

        "-Werror",

        "-Werror",

media/extractors/amr/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ cc_library_shared { 
    name: "libamrextractor",

    name: "libamrextractor",

    relative_install_path: "extractors",

    relative_install_path: "extractors",





    compile_multilib: "both",

    compile_multilib: "first",





    cflags: [

    cflags: [

        "-Werror",

        "-Werror",

media/extractors/flac/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ cc_library_shared { 
    name: "libflacextractor",

    name: "libflacextractor",

    relative_install_path: "extractors",

    relative_install_path: "extractors",





    compile_multilib: "both",

    compile_multilib: "first",





    cflags: [

    cflags: [

        "-Werror",

        "-Werror",