Merge branch 'v1-s' of gitlab.e.foundation:e/os/android_vendor_eos into... (cdba3df7) · Commits · e / os / android_vendor_eos

config/common.mk

+4 −2

Original line number	Diff line number	Diff line
		@@ -25,14 +25,12 @@ PRODUCT_PACKAGES += \
		Mail \
		BlissLauncher \
		BlissIconPack \
		MozillaNlpBackend \
		OpenWeatherMapWeatherProvider \
		AccountManager \
		Camera \
		eDrive \
		Notes \
		Tasks \
		NominatimNlpBackend \
		DroidGuard \
		OpenKeychain \
		Message \
		@@ -43,6 +41,10 @@ PRODUCT_PACKAGES += \
		SplitInstallService \
		WebCalendarManager

		# Removes proprietary apps
		PRODUCT_PACKAGES += \
		RemoveProprietaryApps

		# PicoTTS
		$(call inherit-product, external/svox/svox_tts.mk)

config/permissions/eos-permissions.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -45,9 +45,15 @@
		</exception>

		<exception package="com.generalmagic.magicearth">
		<!-- Bluetooth -->
		<permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/>
		<!-- Camera -->
		<permission name="android.permission.CAMERA" fixed="false"/>
		<!-- Location -->
		<permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"/>
		<permission name="android.permission.ACCESS_COARSE_LOCATION" fixed="false"/>
		<!-- Microphone -->
		<permission name="android.permission.RECORD_AUDIO" fixed="false"/>
		<!-- External storage -->
		<permission name="android.permission.WRITE_EXTERNAL_STORAGE" fixed="false"/>
		<!-- Phone -->

remove/Android.mk

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		LOCAL_PATH := $(call my-dir)

		HOTWORD_PACKAGES := HotwordEnrollmentOKGoogleWCD9340 HotwordEnrollmentXGoogleWCD9340 HotwordEnrollment \
		HotwordEnrollmentOKGoogleWCD9330 HotwordEnrollmentTGoogleWCD9330 HotwordEnrollmentXGoogleWCD9330 \
		HotwordEnrollmentOKGoogleHEXAGON HotwordEnrollmentXGoogleHEXAGON HotwordEnrollmentOKGoogleExCORTEXM4 \
		HotwordEnrollmentXGoogleExCORTEXM4 HotwordEnrollmentOKGoogleRT5677 HotwordEnrollmentOKGoogleWCD9335 \
		HotwordEnrollmentXGoogleWCD9335 HotwordEnrollmentOKGoogleEx2TL3210 HotwordEnrollmentXGoogleEx2TL3210 \
		HotwordEnrollmentOKGoogleWCD9340_SDM845 HotwordEnrollmentXGoogleWCD9340_SDM845 HotwordEnrollmentTGoogleWCD9335 \
		HotwordEnrollmentOKGoogleCORTEXM4 HotwordEnrollmentXGoogleCORTEXM4 HotwordEnrollmentOKGoogleEx3HEXAGON \
		HotwordEnrollmentXGoogleEx3HEXAGON HotwordEnrollmentOKGoogleWM8280 HotwordEnrollmentOKGoogleHI6403 \
		HotwordEnrollmentXGoogleHI6403 HotwordEnrollmentOKGoogleRT5514P HotwordEnrollmentXGoogleRT5514P \
		HotwordEnrollmentOKGoogleFUSIONPro HotwordEnrollmentXGoogleFUSIONPro HotwordEnrollmentOKGoogleFUSION \
		HotwordEnrollmentXGoogleFUSION HotwordEnrollmentXGoogleExWCD9340 HotwordEnrollmentOKGoogleExWCD9340 \
		HotwordEnrollmentOKGoogleRT5514 HotwordEnrollmentXGoogleRT5514 HotwordEnrollmentOKGoogleHEMIDELTA \
		HotwordEnrollmentXGoogleHEMIDELTA

		DEVICE_PERSONALIZATION_PACKAGES := DevicePersonalizationPrebuiltPixel2 DevicePersonalizationPrebuiltPixel3 \
		DevicePersonalizationPrebuiltPixel4 DevicePersonalizationPrebuiltPixel2020 \
		DevicePersonalizationPrebuiltPixel2021 DevicePersonalizationPrebuiltPixel2022

		include $(CLEAR_VARS)
		LOCAL_MODULE := RemoveProprietaryApps
		LOCAL_MODULE_TAGS := optional
		LOCAL_MODULE_CLASS := APPS
		LOCAL_OVERRIDES_PACKAGES := DeviceIntelligenceNetworkPrebuilt AmbientSensePrebuilt \
		$(DEVICE_PERSONALIZATION_PACKAGES) $(HOTWORD_PACKAGES)
		LOCAL_UNINSTALLABLE_MODULE := true
		LOCAL_SRC_FILES := /dev/null
		LOCAL_CERTIFICATE := PRESIGNED
		include $(BUILD_PREBUILT)