diff options
Diffstat (limited to 'target')
26 files changed, 271 insertions, 169 deletions
diff --git a/target/board/generic/device.mk b/target/board/generic/device.mk index fe64bcb..06a7d8a 100644 --- a/target/board/generic/device.mk +++ b/target/board/generic/device.mk @@ -25,6 +25,9 @@ PRODUCT_PROPERTY_OVERRIDES := \ PRODUCT_COPY_FILES := \ device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \ hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf diff --git a/target/board/generic_arm64/device.mk b/target/board/generic_arm64/device.mk index 354fb2a..11a6a31 100644 --- a/target/board/generic_arm64/device.mk +++ b/target/board/generic_arm64/device.mk @@ -25,6 +25,9 @@ PRODUCT_PROPERTY_OVERRIDES := \ PRODUCT_COPY_FILES := \ device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml PRODUCT_PACKAGES := \ diff --git a/target/board/generic_mips/device.mk b/target/board/generic_mips/device.mk index b182c4c..590f422 100644 --- a/target/board/generic_mips/device.mk +++ b/target/board/generic_mips/device.mk @@ -25,6 +25,9 @@ PRODUCT_PROPERTY_OVERRIDES := \ PRODUCT_COPY_FILES := \ device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \ hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf diff --git a/target/board/generic_mips64/device.mk b/target/board/generic_mips64/device.mk index 58fe976..015686e 100644 --- a/target/board/generic_mips64/device.mk +++ b/target/board/generic_mips64/device.mk @@ -25,6 +25,9 @@ PRODUCT_PROPERTY_OVERRIDES := \ PRODUCT_COPY_FILES := \ device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \ hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf diff --git a/target/board/generic_x86/device.mk b/target/board/generic_x86/device.mk index 089f584..b5b0faf 100644 --- a/target/board/generic_x86/device.mk +++ b/target/board/generic_x86/device.mk @@ -25,6 +25,9 @@ PRODUCT_PROPERTY_OVERRIDES := \ PRODUCT_COPY_FILES := \ device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml PRODUCT_PACKAGES := \ diff --git a/target/board/generic_x86_64/device.mk b/target/board/generic_x86_64/device.mk index 089f584..b5b0faf 100755 --- a/target/board/generic_x86_64/device.mk +++ b/target/board/generic_x86_64/device.mk @@ -25,6 +25,9 @@ PRODUCT_PROPERTY_OVERRIDES := \ PRODUCT_COPY_FILES := \ device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml PRODUCT_PACKAGES := \ diff --git a/target/board/vbox_x86/device.mk b/target/board/vbox_x86/device.mk index a44a87f..b51f801 100644 --- a/target/board/vbox_x86/device.mk +++ b/target/board/vbox_x86/device.mk @@ -29,6 +29,9 @@ LOCAL_KERNEL := prebuilts/qemu-kernel/x86/kernel-vbox PRODUCT_COPY_FILES := \ device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \ build/target/board/vbox_x86/init.vbox_x86.rc:root/init.vbox_x86.rc \ $(LOCAL_KERNEL):kernel diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index fc407d3..bce5bb5 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -42,7 +42,8 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_mips.mk \ $(LOCAL_DIR)/full_mips.mk \ $(LOCAL_DIR)/aosp_arm64.mk \ - $(LOCAL_DIR)/aosp_mips64.mk + $(LOCAL_DIR)/aosp_mips64.mk \ + $(LOCAL_DIR)/aosp_x86_64.mk else PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/core.mk \ @@ -63,5 +64,7 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/sdk.mk \ $(LOCAL_DIR)/sdk_x86.mk \ $(LOCAL_DIR)/sdk_mips.mk \ - $(LOCAL_DIR)/large_emu_hw.mk + $(LOCAL_DIR)/sdk_arm64.mk \ + $(LOCAL_DIR)/sdk_x86_64.mk \ + $(LOCAL_DIR)/sdk_mips64.mk endif diff --git a/target/product/base.mk b/target/product/base.mk index 4b8326d..981f965 100644 --- a/target/product/base.mk +++ b/target/product/base.mk @@ -35,12 +35,15 @@ PRODUCT_PACKAGES += \ fsck_msdos \ ime \ input \ + inputflinger \ javax.obex \ libandroid \ libandroid_runtime \ libandroid_servers \ libaudioeffect_jni \ libaudioflinger \ + libaudiopolicyservice \ + libaudiopolicymanager \ libbundlewrapper \ libcamera_client \ libcameraservice \ @@ -48,6 +51,7 @@ PRODUCT_PACKAGES += \ libeffectproxy \ libeffects \ libinput \ + libinputflinger \ libiprouteutil \ libjnigraphics \ libldnhncr \ @@ -55,8 +59,10 @@ PRODUCT_PACKAGES += \ libmedia_jni \ libmediaplayerservice \ libmtp \ + libnetd_client \ libnetlink \ libnetutils \ + libpdfium \ libreference-ril \ libreverbwrapper \ libril \ @@ -65,6 +71,8 @@ PRODUCT_PACKAGES += \ libskia \ libsonivox \ libsoundpool \ + libsoundtrigger \ + libsoundtriggerservice \ libsqlite \ libstagefright \ libstagefright_amrnb_common \ @@ -77,6 +85,8 @@ PRODUCT_PACKAGES += \ libutils \ libvisualizer \ libvorbisidec \ + libmediandk \ + libwifi-service \ media \ media_cmd \ mediaserver \ @@ -93,7 +103,6 @@ PRODUCT_PACKAGES += \ racoon \ run-as \ schedtest \ - screenshot \ sdcard \ services \ settings \ diff --git a/target/product/core.mk b/target/product/core.mk index 8c88b94..875d08c 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -22,16 +22,35 @@ PRODUCT_PACKAGES += \ BasicDreams \ Browser \ + Calculator \ + Calendar \ + CalendarProvider \ + CertInstaller \ Contacts \ + DeskClock \ DocumentsUI \ DownloadProviderUi \ + Email \ + Exchange2 \ ExternalStorageProvider \ + FusedLocation \ + InputDevices \ KeyChain \ + Keyguard \ + LatinIME \ + Launcher2 \ + ManagedProvisioning \ PicoTts \ PacProcessor \ libpac \ + PrintSpooler \ ProxyHandler \ + QuickSearchBox \ + Settings \ SharedStorageBackup \ - VpnDialogs + Telecomm \ + TeleService \ + VpnDialogs \ + MmsService $(call inherit-product, $(SRC_TARGET_DIR)/product/core_base.mk) diff --git a/target/product/core_base.mk b/target/product/core_base.mk index d7d74bc..f14e53d 100644 --- a/target/product/core_base.mk +++ b/target/product/core_base.mk @@ -30,14 +30,12 @@ PRODUCT_PACKAGES += \ libandroidfw \ libaudiopreprocessing \ libaudioutils \ - libbcc \ libfilterpack_imageproc \ libgabi++ \ libmdnssd \ libnfc_ndef \ libpowermanager \ libspeexresampler \ - libstagefright_chromium_http \ libstagefright_soft_aacdec \ libstagefright_soft_aacenc \ libstagefright_soft_amrdec \ @@ -48,6 +46,7 @@ PRODUCT_PACKAGES += \ libstagefright_soft_gsmdec \ libstagefright_soft_h264dec \ libstagefright_soft_h264enc \ + libstagefright_soft_hevcdec \ libstagefright_soft_mp3dec \ libstagefright_soft_mpeg4dec \ libstagefright_soft_mpeg4enc \ @@ -58,26 +57,7 @@ PRODUCT_PACKAGES += \ libvariablespeed \ libwebrtc_audio_preprocessing \ mdnsd \ - mms-common \ requestsync \ - telephony-common \ - voip-common + wifi-service $(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk) -# Override the PRODUCT_BOOT_JARS set in core_minimal.mk. The order matters. -PRODUCT_BOOT_JARS := \ - core-libart \ - conscrypt \ - okhttp \ - core-junit \ - bouncycastle \ - ext \ - framework \ - framework2 \ - telephony-common \ - voip-common \ - mms-common \ - android.policy \ - services \ - apache-xml \ - webviewchromium diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk index c371368..368e468 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -36,15 +36,18 @@ PRODUCT_PACKAGES += \ com.android.media.remotedisplay \ com.android.media.remotedisplay.xml \ drmserver \ + ethernet-service \ framework-res \ idmap \ installd \ + ims-common \ ip \ ip-up-vpn \ ip6tables \ iptables \ keystore \ keystore.default \ + libbcc \ libOpenMAXAL \ libOpenSLES \ libdownmix \ @@ -56,10 +59,17 @@ PRODUCT_PACKAGES += \ libwilhelm \ logd \ make_ext4fs \ + e2fsck \ + resize2fs \ + mms-common \ screencap \ sensorservice \ + telephony-common \ uiautomator \ - webview + uncrypt \ + voip-common \ + webview \ + wifi-service PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.webview.xml:system/etc/permissions/android.software.webview.xml @@ -74,10 +84,16 @@ PRODUCT_BOOT_JARS := \ ext \ framework \ framework2 \ + telephony-common \ + voip-common \ + ims-common \ + mms-common \ android.policy \ services \ apache-xml \ - webviewchromium + ethernet-service \ + webviewchromium \ + wifi-service PRODUCT_RUNTIMES := runtime_libart_default diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk index 52244a3..affef3c 100644 --- a/target/product/core_tiny.mk +++ b/target/product/core_tiny.mk @@ -22,21 +22,12 @@ PRODUCT_PACKAGES := \ ContactsProvider \ CertInstaller \ FusedLocation \ - InputDevices \ - bluetooth-health \ - hostapd \ - wpa_supplicant.conf + InputDevices PRODUCT_PACKAGES += \ - audio \ clatd \ clatd.conf \ - dhcpcd.conf \ - network \ - pand \ - pppd \ - sdptool \ - wpa_supplicant + pppd PRODUCT_PACKAGES += \ audio.primary.default \ @@ -73,17 +64,20 @@ PRODUCT_PACKAGES += \ libdrmframework_jni \ libdrmframework \ make_ext4fs \ + e2fsck \ + resize2fs \ nullwebview \ screencap \ sensorservice \ uiautomator \ + uncrypt \ telephony-common \ voip-common \ mms-common # The order matters PRODUCT_BOOT_JARS := \ - core \ + core-libart \ conscrypt \ okhttp \ core-junit \ @@ -99,16 +93,15 @@ PRODUCT_BOOT_JARS := \ apache-xml \ nullwebview -PRODUCT_RUNTIMES := runtime_libdvm_default +PRODUCT_RUNTIMES := runtime_libart_default PRODUCT_PROPERTY_OVERRIDES += \ ro.carrier=unknown +$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk) $(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) diff --git a/target/product/full_base.mk b/target/product/full_base.mk index 059697e..1daa523 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -26,7 +26,6 @@ PRODUCT_PACKAGES := \ libWnnEngDic \ libWnnJpnDic \ libwnndict \ - VideoEditor \ WAPPushManager PRODUCT_PACKAGES += \ diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk index f98e9a2..2fd2ce8 100644 --- a/target/product/full_base_telephony.mk +++ b/target/product/full_base_telephony.mk @@ -27,7 +27,8 @@ PRODUCT_PROPERTY_OVERRIDES := \ ro.com.android.dataroaming=true PRODUCT_COPY_FILES := \ - device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml + device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ + frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk) diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk index 12797f4..3ee6de8 100644 --- a/target/product/generic_no_telephony.mk +++ b/target/product/generic_no_telephony.mk @@ -17,33 +17,15 @@ # This is a generic phone product that isn't specialized for a specific device. # It includes the base Android platform. -PRODUCT_POLICY := android.policy_phone - PRODUCT_PACKAGES := \ - DeskClock \ Bluetooth \ - Calculator \ - Calendar \ Camera2 \ - CertInstaller \ - Email \ - Exchange2 \ - FusedLocation \ Gallery2 \ - InputDevices \ - Keyguard \ - LatinIME \ - Launcher2 \ Music \ MusicFX \ OneTimeInitializer \ - PrintSpooler \ Provision \ - QuickSearchBox \ - Settings \ SystemUI \ - TeleService \ - CalendarProvider \ WallpaperCropper PRODUCT_PACKAGES += \ @@ -83,7 +65,6 @@ $(call inherit-product-if-exists, external/google-fonts/carrois-gothic-sc/fonts. $(call inherit-product-if-exists, external/google-fonts/coming-soon/fonts.mk) $(call inherit-product-if-exists, external/noto-fonts/fonts.mk) $(call inherit-product-if-exists, external/naver-fonts/fonts.mk) -$(call inherit-product-if-exists, external/sil-fonts/fonts.mk) $(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk) $(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk) diff --git a/target/product/large_emu_hw.mk b/target/product/large_emu_hw.mk deleted file mode 100644 index a918c1d..0000000 --- a/target/product/large_emu_hw.mk +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (C) 2007 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. -# - -# This is a generic product for devices with large display but not specialized -# for a specific device. It includes the base Android platform. - -PRODUCT_POLICY := android.policy_mid - -PRODUCT_PACKAGES := \ - CarHome \ - DeskClock \ - Bluetooth \ - Calculator \ - Calendar \ - CertInstaller \ - Email \ - Exchange2 \ - Gallery2 \ - LatinIME \ - Launcher2 \ - Music \ - Provision \ - QuickSearchBox \ - Settings \ - Sync \ - Updater \ - CalendarProvider \ - SyncProvider \ - bluetooth-health \ - hostapd \ - wpa_supplicant.conf - - -$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk) - -# Overrides -PRODUCT_BRAND := generic -PRODUCT_DEVICE := generic -PRODUCT_NAME := large_emu_hw diff --git a/target/product/sdk.mk b/target/product/sdk.mk index 5926f19..d4f2355 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.mk @@ -14,56 +14,38 @@ # limitations under the License. # -PRODUCT_POLICY := android.policy_phone PRODUCT_PROPERTY_OVERRIDES := PRODUCT_PACKAGES := \ - Calculator \ - DeskClock \ - Email \ - Exchange2 \ - FusedLocation \ + ApiDemos \ + CubeLiveWallpapers \ + CustomLocale \ + Development \ + DevelopmentSettings \ + Dialer \ + EmulatorSmokeTests \ + Fallback \ Gallery \ - Keyguard \ - Music \ - Mms \ - OpenWnn \ - PrintSpooler \ + GestureBuilder \ + LegacyCamera \ + librs_jni \ + libwnndict \ libWnnEngDic \ libWnnJpnDic \ - libwnndict \ - TeleService \ + LiveWallpapersPicker \ + Mms \ + Music \ + OpenWnn \ PinyinIME \ Protips \ - SoftKeyboard \ - SystemUI \ - Launcher2 \ - Development \ - DevelopmentSettings \ - Fallback \ - Settings \ + rild \ SdkSetup \ - CustomLocale \ - sqlite3 \ - InputDevices \ - LatinIME \ - CertInstaller \ - LiveWallpapersPicker \ - ApiDemos \ - GestureBuilder \ - CubeLiveWallpapers \ - QuickSearchBox \ - WidgetPreview \ - librs_jni \ - ConnectivityTest \ - GpsLocationTest \ - CalendarProvider \ - Calendar \ SmokeTest \ SmokeTestApp \ - rild \ - LegacyCamera \ - Dialer + SoftKeyboard \ + sqlite3 \ + SystemUI \ + WidgetPreview # Define the host tools and libs that are parts of the SDK. -include sdk/build/product_sdk.mk @@ -83,6 +65,9 @@ PRODUCT_COPY_FILES := \ frameworks/base/data/sounds/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \ frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \ device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \ frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \ frameworks/native/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml \ @@ -98,19 +83,21 @@ $(call inherit-product-if-exists, external/google-fonts/carrois-gothic-sc/fonts. $(call inherit-product-if-exists, external/google-fonts/coming-soon/fonts.mk) $(call inherit-product-if-exists, external/noto-fonts/fonts.mk) $(call inherit-product-if-exists, external/naver-fonts/fonts.mk) -$(call inherit-product-if-exists, external/sil-fonts/fonts.mk) $(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk) $(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk) -# Overrides -PRODUCT_BRAND := generic -PRODUCT_NAME := sdk -PRODUCT_DEVICE := generic +# include available languages for TTS in the system image +-include external/svox/pico/lang/PicoLangDeDeInSystem.mk +-include external/svox/pico/lang/PicoLangEnGBInSystem.mk +-include external/svox/pico/lang/PicoLangEnUsInSystem.mk +-include external/svox/pico/lang/PicoLangEsEsInSystem.mk +-include external/svox/pico/lang/PicoLangFrFrInSystem.mk +-include external/svox/pico/lang/PicoLangItItInSystem.mk # locale + densities. en_US is both first and in alphabetical order to # ensure this is the default locale. -PRODUCT_LOCALES = \ +PRODUCT_LOCALES := \ en_US \ ldpi \ hdpi \ @@ -174,10 +161,7 @@ PRODUCT_LOCALES = \ zh_CN \ zh_TW -# include available languages for TTS in the system image --include external/svox/pico/lang/PicoLangDeDeInSystem.mk --include external/svox/pico/lang/PicoLangEnGBInSystem.mk --include external/svox/pico/lang/PicoLangEnUsInSystem.mk --include external/svox/pico/lang/PicoLangEsEsInSystem.mk --include external/svox/pico/lang/PicoLangFrFrInSystem.mk --include external/svox/pico/lang/PicoLangItItInSystem.mk +# Overrides +PRODUCT_BRAND := generic +PRODUCT_NAME := sdk +PRODUCT_DEVICE := generic diff --git a/target/product/sdk_arm64.mk b/target/product/sdk_arm64.mk new file mode 100644 index 0000000..582a779 --- /dev/null +++ b/target/product/sdk_arm64.mk @@ -0,0 +1,28 @@ +# +# Copyright (C) 2009 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. +# + +# This is a build configuration for a full-featured build of the +# Open-Source part of the tree. It's geared toward a US-centric +# build quite specifically for the emulator, and might not be +# entirely appropriate to inherit from for on-device configurations. + +$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk) + +# Overrides +PRODUCT_BRAND := generic_arm64 +PRODUCT_NAME := sdk_arm64 +PRODUCT_DEVICE := generic_arm64 +PRODUCT_MODEL := Android SDK built for arm64 diff --git a/target/product/sdk_mips64.mk b/target/product/sdk_mips64.mk new file mode 100644 index 0000000..c00de06 --- /dev/null +++ b/target/product/sdk_mips64.mk @@ -0,0 +1,28 @@ +# +# Copyright (C) 2009 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. +# + +# This is a build configuration for a full-featured build of the +# Open-Source part of the tree. It's geared toward a US-centric +# build quite specifically for the emulator, and might not be +# entirely appropriate to inherit from for on-device configurations. + +$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk) + +# Overrides +PRODUCT_BRAND := generic_mips64 +PRODUCT_NAME := sdk_mips64 +PRODUCT_DEVICE := generic_mips64 +PRODUCT_MODEL := Android SDK built for mips64 diff --git a/target/product/sdk_x86.mk b/target/product/sdk_x86.mk index 873d0c0..6c5e746 100644 --- a/target/product/sdk_x86.mk +++ b/target/product/sdk_x86.mk @@ -19,7 +19,7 @@ # build quite specifically for the emulator, and might not be # entirely appropriate to inherit from for on-device configurations. -include $(SRC_TARGET_DIR)/product/sdk.mk +$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk) # Overrides PRODUCT_BRAND := generic_x86 diff --git a/target/product/sdk_x86_64.mk b/target/product/sdk_x86_64.mk new file mode 100644 index 0000000..3816cf9 --- /dev/null +++ b/target/product/sdk_x86_64.mk @@ -0,0 +1,28 @@ +# +# Copyright (C) 2009 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. +# + +# This is a build configuration for a full-featured build of the +# Open-Source part of the tree. It's geared toward a US-centric +# build quite specifically for the emulator, and might not be +# entirely appropriate to inherit from for on-device configurations. + +$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk) + +# Overrides +PRODUCT_BRAND := generic_x86_64 +PRODUCT_NAME := sdk_x86_64 +PRODUCT_DEVICE := generic_x86_64 +PRODUCT_MODEL := Android SDK built for x86_64 diff --git a/target/product/security/Android.mk b/target/product/security/Android.mk new file mode 100644 index 0000000..5a40397 --- /dev/null +++ b/target/product/security/Android.mk @@ -0,0 +1,12 @@ +LOCAL_PATH:= $(call my-dir) + +####################################### +# verity_key +include $(CLEAR_VARS) + +LOCAL_MODULE := verity_key +LOCAL_SRC_FILES := $(LOCAL_MODULE) +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) + +include $(BUILD_PREBUILT) diff --git a/target/product/security/verity_key b/target/product/security/verity_key Binary files differnew file mode 100644 index 0000000..8db965f --- /dev/null +++ b/target/product/security/verity_key diff --git a/target/product/security/verity_private_dev_key b/target/product/security/verity_private_dev_key new file mode 100644 index 0000000..92528e9 --- /dev/null +++ b/target/product/security/verity_private_dev_key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDQxdVrH2RB1eg5 +17/gBmLzW1Ds10RG6ctNZMhxppMOLnEZViKGv1VNRhxqK/JKTv2UujgZ94SJcDub +G+DwAwaGZKQqDYUa0VU2cng8TYPcnYGPdJ7Usckp6tdg64vns7e+VVf0dOyEovR+ +JyeYUz05OhUMYP9xJIhpA2XnXe5Ekb9iTFSYo9uBpoXDD4IY7aOqUxSbv9wMtyIp +dl+oTm0+kqRRi4KoxGHV0CzDseEUuWG/Kp/7aVF9Sg45NcC6KYvrGysUKA+Bt09O +feDn/HRpT9SfRElJa5DRms33UBUtnom15F4yd4vvFgubB0nkPOUuwfZhTFfgeuY4 +H2bHkjKbAgMBAAECggEAMpFYqkPGQvQO9cO+ZALoAM4Dgfp6PTrv1WUt7+lLAUpa +dqqYXk8F2Fu9EjJm03ziix237QI5Bhk7Nsy/5SK2d+L0qILx1JcTrsZ3PRQBdnRo +J1k2B4qwkQii9oTXNF4hiWaekUWo7E+ULOJLAuhWkf/xjTgJZ1xT9iuuiSYFSnIa +9ABNH0vCaKEkW/4ri6fdtXmO26C/ltJlnozl86x07PIFh4uBas7/40E8ykFP00CS +zdhMh+2DGyCb1Q0eJ1IfGILNatkLNEd2BHgQ7qNBkN9yShZfhvIPblr5gSUlZplX +diV20ZGLAfByKWgZZWKkwl9KzaisL/J/4dr2UlSVEQKBgQDxAYTsgoTkkP0TKzr3 +i3ljT8OuVOj6TwZVBJYe2MIJ3veivS3gWB53FpsKthbib7y8ifIakn15mQkNCK5R +7H7F5lvZCNnB6shY5Dz7nLJxKLALcAg+d12l3gTbFQeFDs0iQQJF7P8hs/GPF7kY +Layb7EF0uzYjyHJCKtFdaZaeZwKBgQDdwvCb7NJVeGTcE97etL+8acu9y4GlqKEF +o0Vkw8TjNKj/KuDkbkAk9hXxU1ZCmDU3y6r8CVHYl0Sqh08plEhkYB/j3sFy81zY +3xu/rLFysBwjeJHHlPjRTYkdKr9pABmm8NIEShvu9u8i+mpOhjbX72HxZL+i4Fou +gz58wEdBrQKBgG8CfyKdn+7UJe3tbLTXRquK8xxauhGJ0uXYPfmpZ/8596C7OOVs +UWQTQoj1hKb6RtolRCIfNbKL3hJl3D2aDG7Fg6r9m6fpqCzhvIE9FShwUF6EVRfI +zZb4JA5xqkwMnEpZ3V0uI/p3Mx3xFG3ho+8SLLhC/1YOHysBI/y+BQWjAoGAYiqQ +PkXYWhOAeleleeqDUdF3al3y1zVNimRbLJ7owjcmdEYz5YrUhEgXMIvWjIY6UKes +2gL6IynbMK3TIjHM1fojQ8jw04TdXfdtnizBJGbHHgCab8IHXwe2oZ2xu7ZapKbI +ITP5J5BSDabSdk49attB/Qy/NEeiRCK+/5RSNsUCgYAg6vX9VqMEkhPHeoFfdLGD +EQPPN6QLrQ4Zif0GKxH96znNSv0rXdNp9t0kyapdgzMuCwIEuOkCSiKgmfjTWnYO +qh5HMUuD2VbfWwI9jVujQMRmqiaFF7VxxA1bP5j1hJlI6cn1Fjlpi+NsNZN4nm3Q +92SEwX2vDgjrU0NAtFFL1Q== +-----END PRIVATE KEY----- diff --git a/target/product/verity.mk b/target/product/verity.mk new file mode 100644 index 0000000..b14eaa4 --- /dev/null +++ b/target/product/verity.mk @@ -0,0 +1,24 @@ +# +# Copyright (C) 2014 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. +# + +# Provides dependencies necessary for verified boot + +PRODUCT_SUPPORTS_VERITY := true +PRODUCT_VERITY_SIGNING_KEY := build/target/product/security/verity_private_dev_key +PRODUCT_VERITY_MOUNTPOINT := system + +PRODUCT_PACKAGES += \ + verity_key |