Update the integration instructions in README.

diff --git a/Android.mk b/Android.mk
index 6ef1ea63f726ca19e201c0fc1d0a6502f8797dc4..85ae61f3aa1712fffa08b65547757fb734184815 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -40,12 +40,9 @@ LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 # Keep the current package signature, which will allow users to upgrade Privacy Browser with packages signed by Stoutner.
 LOCAL_CERTIFICATE := PRESIGNED
 
 # Keep the current package signature, which will allow users to upgrade Privacy Browser with packages signed by Stoutner.
 LOCAL_CERTIFICATE := PRESIGNED
 

-# Replace system references to `Browser` and `Browser2` with Privacy Browser.
+# Replace the `Browser` and `Browser2` packages with Privacy Browser.

 LOCAL_OVERRIDES_PACKAGES := Browser Browser2
 
 LOCAL_OVERRIDES_PACKAGES := Browser Browser2
 

-# Uncomment the following line if you have removed the `Browser` or `Browser2` repository in the your local manifest.
-# PRODUCT_PACKAGES := privacy-browser
-

 # Indicate that this is an optional build (as opposed to `users`, `eng`, or `tests`).
 LOCAL_MODULE_TAGS := optional
 
 # Indicate that this is an optional build (as opposed to `users`, `eng`, or `tests`).
 LOCAL_MODULE_TAGS := optional
 

diff --git a/README b/README
index bf93acbcdb3b88c87c24c861947ec70ebf8cea54..753522a57196dad801d0c63f01c0499e8247abaa 100644 (file)
--- a/README
+++ b/README
@@ -15,4 +15,8 @@ Feature requests and bug reports can be submitted at https://redmine.stoutner.co
 To integrate Privacy Browser into a ROM build, add the following lines to the build manifest:
 
 <remote name="stoutner" fetch="git://git.stoutner.com" />
 To integrate Privacy Browser into a ROM build, add the following lines to the build manifest:
 
 <remote name="stoutner" fetch="git://git.stoutner.com" />

-  <project path="external/stoutner/privacy-browser" remote="stoutner" name="git/PrivacyBrowserROMIntegration.git" revision="master" />
+<project path="external/stoutner/privacy-browser" remote="stoutner" name="git/PrivacyBrowserROMIntegration.git" revision="master" />
+
+The sample Android.mk file replaces the `Browser` or `Browser2` package from AOSP.  If you have removed them from your local manifest, you need to add the following statement:
+
+PRODUCT_PACKAGES += privacy-browser