From 70a255f3c9f9f549740befff8f3ec1974102df5e Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 18 Mar 2015 12:08:31 -0700
Subject: [PATCH] Remove LOCAL_CPP_EXTENSION during Android.mk translation

LOCAL_CPP_EXTENSION is unnecesary in soong, it can accept files
with .cc or .cpp extension.

Change-Id: I64cb37f199e25f1fed7e53144f85e52ba616529a
---
 androidmk/cmd/androidmk/android.go   | 4 ++++
 androidmk/cmd/androidmk/androidmk.go | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go
index 48905a7d2..5544dfdea 100644
--- a/androidmk/cmd/androidmk/android.go
+++ b/androidmk/cmd/androidmk/android.go
@@ -56,6 +56,10 @@ var boolProperties = map[string]string{
 	"LOCAL_RTTI_FLAG":               "rtti",
 }
 
+var deleteProperties = map[string]struct{}{
+	"LOCAL_CPP_EXTENSION": struct{}{},
+}
+
 var propertySuffixes = []struct {
 	suffix string
 	class  string
diff --git a/androidmk/cmd/androidmk/androidmk.go b/androidmk/cmd/androidmk/androidmk.go
index 6695181b3..fd31a138d 100644
--- a/androidmk/cmd/androidmk/androidmk.go
+++ b/androidmk/cmd/androidmk/androidmk.go
@@ -241,6 +241,8 @@ func handleAssignment(file *bpFile, assignment mkparser.Assignment, c *condition
 		err = setVariable(file, assignment.Value, assignment.Type == "+=", prop, bpparser.List, true, class, suffix)
 	} else if prop, ok := boolProperties[name]; ok {
 		err = setVariable(file, assignment.Value, assignment.Type == "+=", prop, bpparser.Bool, true, class, suffix)
+	} else if _, ok := deleteProperties[name]; ok {
+		return
 	} else {
 		if name == "LOCAL_PATH" {
 			// Nothing to do, except maybe avoid the "./" in paths?