Revert "flounder: make aosp_flounder a 64-bit build"
This reverts commit faf0c33d065ae94c31094d0f9e9e3e054edf1f82.
The build server builds aosp_flounder with make tests, which doesn't
work on a 64-bit build.
Change-Id: Ibedc811c834cf1f50f0f333c329a2c36bc68e077
diff --git a/aosp_flounder.mk b/aosp_flounder.mk
index 730884b..0d867ed 100644
--- a/aosp_flounder.mk
+++ b/aosp_flounder.mk
@@ -21,10 +21,28 @@
# lines, aosp and flounder, hence its name.
#
-$(call inherit-product, device/htc/flounder/aosp_flounder64.mk)
+# 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)
+
+PRODUCT_RUNTIMES := runtime_libart_default
+PRODUCT_RUNTIMES += runtime_libdvm
PRODUCT_NAME := aosp_flounder
PRODUCT_DEVICE := flounder
PRODUCT_BRAND := Android
PRODUCT_MODEL := AOSP on Flounder
PRODUCT_MANUFACTURER := nVidia
+PRODUCT_RESTRICT_VENDOR_FILES := owner path