Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Merge pull request #1 from fatseng/b2g-5.1.1_r15
Browse files Browse the repository at this point in the history
Bug 1241747 - solve build break and add necessary
  • Loading branch information
farmer-tseng committed Jan 26, 2016
2 parents 291a15e + eddfd17 commit b8b9f00
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions products/atv_base.mk
Expand Up @@ -33,7 +33,6 @@ PRODUCT_PACKAGES += \
DefaultContainerService \
UserDictionaryProvider \
libaudiopreprocessing \
libfilterpack_imageproc \
libgabi++ \
libkeystore \
libstagefright_soft_aacdec \
Expand Down Expand Up @@ -95,7 +94,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PROPERTY_OVERRIDES += \
persist.sys.media.avsync=true

$(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk)
#$(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk)
$(call inherit-product-if-exists, external/svox/pico/lang/all_pico_languages.mk)
$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
$(call inherit-product-if-exists, external/google-fonts/dancing-script/fonts.mk)
Expand All @@ -108,3 +107,6 @@ $(call inherit-product-if-exists, external/naver-fonts/fonts.mk)
$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
$(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)
# for b2g
$(call inherit-product, external/moztt/fonts.mk)
$(call inherit-product, gonk-misc/b2g.mk)

0 comments on commit b8b9f00

Please sign in to comment.