Commits

Stephen Smalley committed 1ada7fc Merge

Merge branch 'seandroid' into intent_mac

Comments (0)

Files changed (2)

target/product/core.mk

     telephony-common \
     voip-common \
     SEAdmin \
-    auditd
+    auditd \
+    selinux-network.sh
 
 # host-only dependencies
 ifeq ($(WITH_HOST_DALVIK),true)

target/product/sdk.mk

 
 include $(SRC_TARGET_DIR)/product/emulator.mk
 
+$(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk)
 $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
 $(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
 $(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk)