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

Commit 64b00e3f authored by Andreas Huber's avatar Andreas Huber
Browse files

Squashed commit of the following: 

commit b03d5f537dee393affddf89663ae6977a5512d98
Author: Andreas Huber <andih@google.com>
Date:   Thu Dec 17 14:00:37 2009 -0800

    Update cleanspec to facilitate incremental building with full stagefright lib.

commit b92560a1989f8b9cb27a8772cec5346d3d90dc84
Author: Andreas Huber <andih@google.com>
Date:   Thu Dec 17 13:31:48 2009 -0800

    Enable building stagefright in all builds, make stagefright the default player.
parent c4be3ecb

cleanspec.mk

+2 −0
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libmediaplayerservice_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libstagefright_intermediates)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

core/main.mk

+5 −1
Original line number Diff line number Diff line
@@ -254,6 +254,11 @@ ADDITIONAL_BUILD_PROPERTIES += ro.config.nocheckin=yes 
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)),)
@@ -292,7 +297,6 @@ ADDITIONAL_BUILD_PROPERTIES += ro.config.sync=yes 
# the cause of ANRs in the content process

ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.stack-trace-file=/data/anr/traces.txt





# ------------------------------------------------------------

# Define a function that, given a list of module tags, returns

# non-empty if that module should be installed in /system.

target/product/core.mk

+3 −0
Original line number Diff line number Diff line
@@ -26,3 +26,6 @@ PRODUCT_PACKAGES := \ 
    UserDictionaryProvider \

    PackageInstaller \

    Bugreport



PRODUCT_PROPERTY_OVERRIDES += \

    media.stagefright.enable-player=true