Commit 66766fe4 authored Oct 06, 2014 by Matt Mower Committed by Dees Troy Oct 08, 2014

Update RECOVERY_VARIANT blocking to use project-path-for

Using RECOVERY_VARIANT to allow recovery to reside at
bootable/recovery-(variant) has changed at CM. project-path-for now
handles all the path re-mapping. This is simply a compatibility update
to be able to continue using RECOVERY_VARIANT with TWRP in a CM tree.

Change-Id: I66769d85b2a111e837f206b1c9a5bc07d6ac0d86

parent ff5935f7

Android.mk

+9 −5

Original line number	Diff line number	Diff line
		@@ -14,13 +14,17 @@

		LOCAL_PATH := $(call my-dir)

		ifeq ($(RECOVERY_VARIANT),)
		ifdef project-path-for
		ifeq ($(LOCAL_PATH),$(call project-path-for,recovery))
		PROJECT_PATH_AGREES := true
		endif
		else
		ifeq ($(LOCAL_PATH),bootable/recovery)
		RECOVERY_VARIANT := twrp
		PROJECT_PATH_AGREES := true
		endif
		endif

		ifeq ($(RECOVERY_VARIANT),twrp)
		ifeq ($(PROJECT_PATH_AGREES),true)

		include $(CLEAR_VARS)