aosp_flounder32: Keep it in sync with aosp_flounder.
Change-Id: I0217c7c0e9a1a1ef59d6e5908a0d90603e62a076
(cherry picked from commit 2f52d1f89fef7ef9bc449cabfe276a09c3caea75)
diff --git a/aosp_flounder32.mk b/aosp_flounder32.mk
index 36ae140..28e228e 100644
--- a/aosp_flounder32.mk
+++ b/aosp_flounder32.mk
@@ -12,34 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#
-# This file is the build configuration for an aosp Android
-# build for flounder hardware. This cleanly combines a set of
-# device-specific aspects (drivers) with a device-agnostic
-# product configuration (apps). Except for a few implementation
-# details, it only fundamentally contains two inherit-product
-# lines, aosp and flounder, hence its name.
-#
-
-# Live Wallpapers
-PRODUCT_PACKAGES += \
- LiveWallpapers \
- LiveWallpapersPicker \
- MagicSmokeWallpapers \
- VisualizationWallpapers \
- librs_jni
-
-PRODUCT_PROPERTY_OVERRIDES := \
- net.dns1=8.8.8.8 \
- net.dns2=8.8.4.4
-
-# Inherit from those products. Most specific first.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
-$(call inherit-product, device/htc/flounder/device.mk)
+$(call inherit-product, $(LOCAL_PATH)/aosp_flounder.mk)
PRODUCT_NAME := aosp_flounder32
PRODUCT_DEVICE := flounder32
-PRODUCT_BRAND := Android
PRODUCT_MODEL := 32-bit AOSP on Flounder
-PRODUCT_MANUFACTURER := HTC
-PRODUCT_RESTRICT_VENDOR_FILES := owner path