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

Commit f755f276 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix for sdk builds."

parents 67a9b69f d73a1d99

media/libstagefright/MediaExtractorFactory.cpp

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


namespace android {



static const char *kUpdateApkPath = "/system/priv-app/MediaUpdate/MediaUpdate.apk";

static const char *kUpdateApkPath = "/system/app/MediaUpdate/MediaUpdate.apk";



// static

sp<IMediaExtractor> MediaExtractorFactory::Create(

packages/MediaUpdate/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ include $(CLEAR_VARS) 


LOCAL_PACKAGE_NAME := MediaUpdate

LOCAL_MODULE_OWNER := google

LOCAL_PRIVILEGED_MODULE := true



# TODO: create a separate key for this package.

LOCAL_CERTIFICATE := platform
@@ -34,6 +33,7 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.cfg 
LOCAL_MULTILIB := first



# Embed native libraries in package, rather than installing to /system/lib*.

# TODO: Find a right way to include libs in the apk. b/72066556

LOCAL_MODULE_TAGS := samples



# To embed native libraries in package, uncomment the lines below.