Reuse gonk-misc/b2g.mk. Remove fakeperm, drmserver and installd.

Change-Id: I2db7e619d12bf4688a4bc3430e835e5479a4b87d

b2g_product.mk

@@ -25,26 +25,9 @@
 # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-HTTP=android#  Disable chrome HTTP stack in frameworks/base/media/libstagefright/Android.mk
-
-PRODUCT_PACKAGES += b2g.sh fakeperm gaia gecko init.b2g.rc
-PRODUCT_PACKAGES += librecovery
-
-PRODUCT_PACKAGES += \
-   OpenSans-BoldItalic.ttf \
-   OpenSans-Bold.ttf \
-   OpenSans-ExtraBoldItalic.ttf \
-   OpenSans-ExtraBold.ttf \
-   OpenSans-Italic.ttf \
-   OpenSans-LightItalic.ttf \
-   OpenSans-Light.ttf \
-   OpenSans-Regular.ttf \
-   OpenSans-SemiboldItalic.ttf \
-   OpenSans-Semibold.ttf \
-   MozTT-Bold.ttf \
-   MozTT-Light.ttf \
-   MozTT-Medium.ttf \
-   MozTT-Regular.ttf \
+include gonk-misc/b2g.mk
+TARGET_PROVIDES_INIT_RC :=
+PRODUCT_PACKAGES := $(filter-out fakeperm rilproxy,$(PRODUCT_PACKAGES))
 
 PRODUCT_PROPERTY_OVERRIDES += \
   ro.moz.ril.emergency_by_default=true

patch/ics/build/build.patch

@@ -27,7 +27,7 @@ diff --git a/target/product/core.mk b/target/product/core.mk
 index abb2d9f..c3c6e9e 100644
 --- a/target/product/core.mk
 +++ b/target/product/core.mk
-@@ -23,45 +23,11 @@ PRODUCT_PROPERTY_OVERRIDES := \
+@@ -23,46 +23,11 @@ PRODUCT_PROPERTY_OVERRIDES := \
      ro.config.alarm_alert=Alarm_Classic.ogg
  
  PRODUCT_PACKAGES := \
@@ -70,9 +70,24 @@ index abb2d9f..c3c6e9e 100644
 -    framework-res \
      hprof-conv \
 -    icu.dat \
-     installd \
+-    installd \
      ip \
      ip-up-vpn \
+     ip6tables \
+diff --git a/target/product/full_base.mk b/target/product/full_base.mk
+index d89af51..e220778 100644
+--- a/target/product/full_base.mk
++++ b/target/product/full_base.mk
+@@ -20,9 +20,6 @@
+ # in inherited configurations.
+ 
+ PRODUCT_PACKAGES := \
+-    drmserver \
+-    libdrmframework \
+-    libdrmframework_jni \
+     libfwdlockengine \
+     OpenWnn \
+     PinyinIME \
 diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
 index 5169f4e..4a4d57e 100644
 --- a/target/product/generic_no_telephony.mk

patch/ics/frameworks/base/disable-ServiceManager-permission-check.patch

+diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp
+index 1fa4c35..8fdfb4b 100644
+--- a/libs/binder/IServiceManager.cpp
++++ b/libs/binder/IServiceManager.cpp
+@@ -61,7 +61,7 @@ bool checkCallingPermission(const String16& permission, int32_t* outPid, int32_t
+     uid_t uid = ipcState->getCallingUid();
+     if (outPid) *outPid = pid;
+     if (outUid) *outUid = uid;
+-    return checkPermission(permission, pid, uid);
++    return true;
+ }
+ 
+ bool checkPermission(const String16& permission, pid_t pid, uid_t uid)
+-- 
+1.7.8.3
+