Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4348f0e5 authored Aug 14, 2017 by Mathieu Chartier Committed by android-build-merger Aug 14, 2017

Merge "Add frameworks base config and move text blobs there" into oc-mr1-dev

am: fcfe9d84

Change-Id: Ida4184144880ef5c3f6a5522231b0a3edc31a4e4

parents e5cdc925 fcfe9d84

compiled-classes-phone→config/compiled-classes-phone

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,7 @@
	# to your device.mk, e.g.,		# to your device.mk, e.g.,
	#		#
	# PRODUCT_COPY_FILES += \		# PRODUCT_COPY_FILES += \
	# frameworks/base/compiled-classes-phone:system/etc/compiled-classes		# frameworks/base/config/compiled-classes-phone:system/etc/compiled-classes
	#		#
	android.R$styleable		android.R$styleable
	android.accessibilityservice.AccessibilityServiceInfo		android.accessibilityservice.AccessibilityServiceInfo

dirty-image-objects→config/dirty-image-objects

+0 −0

File moved.

preloaded-classes→config/preloaded-classes

+0 −0

File moved.