Add performance and best practices documentation am: bc203622e6 am: 5f45e9b1a6
am: 5fcb0c5420

Change-Id: Id4f3bb108d8fcaae4aed804bd824d5fc8b0781f3
diff --git a/android/variable.go b/android/variable.go
index 2c2a0cf..800b1a1 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -101,6 +101,15 @@
 		Uml struct {
 			Cppflags []string
 		}
+
+		Arc struct {
+			Cflags       []string
+			Exclude_srcs []string
+			Include_dirs []string
+			Shared_libs  []string
+			Static_libs  []string
+			Srcs         []string
+		}
 	} `android:"arch_variant"`
 }
 
@@ -166,6 +175,7 @@
 	Enforce_vintf_manifest     *bool `json:",omitempty"`
 	Pdk                        *bool `json:",omitempty"`
 	Uml                        *bool `json:",omitempty"`
+	Arc                        *bool `json:",omitempty"`
 	MinimizeJavaDebugInfo      *bool `json:",omitempty"`
 
 	IntegerOverflowExcludePaths *[]string `json:",omitempty"`
diff --git a/cc/config/global.go b/cc/config/global.go
index 55ae9e3..f06d0bd 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -177,7 +177,7 @@
 	// This is used by non-NDK modules to get jni.h. export_include_dirs doesn't help
 	// with this, since there is no associated library.
 	pctx.PrefixedExistentPathsForSourcesVariable("CommonNativehelperInclude", "-I",
-		[]string{"libnativehelper/include_deprecated"})
+		[]string{"libnativehelper/include_jni"})
 
 	pctx.SourcePathVariable("ClangDefaultBase", ClangDefaultBase)
 	pctx.VariableFunc("ClangBase", func(config android.Config) (string, error) {
diff --git a/java/config/config.go b/java/config/config.go
index 75176c9..e0c2c6e 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -39,6 +39,7 @@
 		"services",
 		"android.car",
 		"android.car7",
+		"core-oj",
 	}
 )