am a8d15474: am 04cff708: resolved conflicts for merge of 7382ec7d to klp-dev-plus-aosp
* commit 'a8d15474ebb7b595f842ffb23a36cce9bc382f10':
ota_from_target_files: Add an option to not sign OTA packages
diff --git a/core/pathmap.mk b/core/pathmap.mk
index 5dfc543..9363271 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -109,6 +109,7 @@
v7/gridlayout \
v7/appcompat \
v7/mediarouter \
+ v7/recyclerview \
v8/renderscript \
v13
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
new file mode 100644
index 0000000..f19fd88
--- /dev/null
+++ b/target/product/core_tiny.mk
@@ -0,0 +1,103 @@
+#
+# Copyright (C) 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Tiny configuration for small devices such as wearables. Includes base and embedded.
+# No telephony
+
+PRODUCT_PACKAGES := \
+ Bluetooth \
+ CertInstaller \
+ FusedLocation \
+ InputDevices \
+ bluetooth-health \
+ hostapd \
+ wpa_supplicant.conf
+
+PRODUCT_PACKAGES += \
+ audio \
+ clatd \
+ clatd.conf \
+ dhcpcd.conf \
+ network \
+ pand \
+ pppd \
+ sdptool \
+ wpa_supplicant
+
+PRODUCT_PACKAGES += \
+ audio.primary.default \
+ audio_policy.default \
+ local_time.default \
+ power.default
+
+PRODUCT_PACKAGES += \
+ local_time.default
+
+PRODUCT_PACKAGES += \
+ BackupRestoreConfirmation \
+ DefaultContainerService \
+ SettingsProvider \
+ Shell \
+ bu \
+ com.android.location.provider \
+ com.android.location.provider.xml \
+ framework-res \
+ installd \
+ ip \
+ ip-up-vpn \
+ ip6tables \
+ iptables \
+ keystore \
+ keystore.default \
+ libOpenMAXAL \
+ libOpenSLES \
+ libdownmix \
+ libfilterfw \
+ libsqlite_jni \
+ libwilhelm \
+ make_ext4fs \
+ screencap \
+ sensorservice \
+ uiautomator
+
+# The order matters
+PRODUCT_BOOT_JARS := \
+ core \
+ conscrypt \
+ okhttp \
+ core-junit \
+ bouncycastle \
+ ext \
+ framework \
+ framework2 \
+ android.policy \
+ services \
+ apache-xml
+
+PRODUCT_RUNTIMES := runtime_libdvm_default
+
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.carrier=unknown
+
+MINIMAL_FONT_FOOTPRINT := true
+
+$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
+
+# Overrides
+PRODUCT_BRAND := tiny
+PRODUCT_DEVICE := tiny
+PRODUCT_NAME := core_tiny
+
+$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)