am f2bab487: Merge "Remove now unnecessary property overrides to opt into stagefright." into gingerbread
Merge commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a' into gingerbread-plus-aosp
* commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a':
Remove now unnecessary property overrides to opt into stagefright.
diff --git a/core/main.mk b/core/main.mk
index c9f5b5f..920548d 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -266,11 +266,6 @@
else # !sdk
endif
-# build the full stagefright library
-ifneq ($(strip BUILD_WITH_FULL_STAGEFRIGHT),)
-BUILD_WITH_FULL_STAGEFRIGHT := true
-endif
-
## precise GC ##
ifneq ($(filter dalvik.gc.type-precise,$(PRODUCT_TAGS)),)
diff --git a/target/product/core.mk b/target/product/core.mk
index 351033a..8ee073a 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -43,10 +43,3 @@
PackageInstaller \
DefaultContainerService \
Bugreport
-
-PRODUCT_PROPERTY_OVERRIDES += \
- media.stagefright.enable-player=true \
- media.stagefright.enable-meta=true \
- media.stagefright.enable-scan=true \
- media.stagefright.enable-http=true \
- media.stagefright.enable-vorbis=true