chore: remove redundant android_out_of_tree

Currently `BUILDER_ANDROID_NINJA` denotes Android
out of tree build thus `ANDROID_OUT_OF_TREE` config
is redundant and is not needed anymore.

Signed-off-by: Sebastian Birunt <[email protected]>
Change-Id: Ia4ecf0e4acd765212e23fa2e700684c7f6b61fe6

Author: birunts

core/standalone.go

@@ -262,11 +262,6 @@ func Main() {
 		ctx.RegisterBottomUpMutator("collect_buildbp", collectBuildBpFilesMutator)
 		ctx.RegisterSingletonType("androidbp_singleton", androidBpSingletonFactory)
 	} else if builder_android_ninja {
-		// `builder_android_ninja` denotes it is Android out of tree build
-		// thus `android_out_of_tree` should be `true`.
-		if out_of_tree, _ := cfg.Properties.GetBoolMaybe("android_out_of_tree"); !out_of_tree {
-			panic("Wrong configuration for 'builder_android_ninja' and 'android_out_of_tree'.")
-		}
 		cfg.Generator = &androidNinjaGenerator{}
 	} else {
 		utils.Die("Unknown builder backend")

core/toolchain/clang.go

@@ -105,10 +105,8 @@ func newToolchainClangCommon(props *config.Properties, tgt TgtType) (tc toolchai
 
 	tc.target = props.GetString(string(tgt) + "_clang_triple")
 
-	out_of_tree, _ := props.GetBoolMaybe("android_out_of_tree")
-
 	// Here we add flags relating to android out of tree builds
-	if out_of_tree {
+	if out_of_tree := props.GetBool("builder_android_ninja"); out_of_tree {
 		tc.cflags = append(tc.cflags, "-DANDROID")
 
 		if tgt == TgtTypeTarget {

mconfig/basics.Mconfig

@@ -24,12 +24,6 @@ config FUCHSIA
 
 endchoice
 
-config ANDROID_OUT_OF_TREE
-	bool
-	depends on ANDROID
-	default y if BUILDER_ANDROID_NINJA
-	default n
-
 choice
 	prompt "Builder"
 	default BUILDER_ANDROID_BP if ANDROID

tests_android_oot/bootstrap_android_oot

@@ -106,8 +106,8 @@ ln -sf "bob" "${BUILDDIR}/buildme"
 
 # echo "To configure the build directory, run ${BUILDDIR}/config ARGS"
 if [ $MENU -ne 1 ] || [ ! -f "${BPBUILD_DIR}/${CONFIGNAME}" ] ; then
-    printf "Running configuration:\n  \e[35m%s/config ANDROID=y ANDROID_OUT_OF_TREE=y BUILDER_ANDROID_BP=y ANDROID_PLATFORM_VERSION=\"%s\" %s\e[0m\n" "${BUILDDIR}" "${ANDROID_VERSION}" "$@"
-    "${BUILDDIR}/config" ANDROID=y ANDROID_OUT_OF_TREE=y BUILDER_ANDROID_BP=y ANDROID_PLATFORM_VERSION="${ANDROID_VERSION}" "$@"
+    printf "Running configuration:\n  \e[35m%s/config ANDROID=y BUILDER_ANDROID_NINJA=y ANDROID_PLATFORM_VERSION=\"%s\" %s\e[0m\n" "${BUILDDIR}" "${ANDROID_VERSION}" "$@"
+    "${BUILDDIR}/config" ANDROID=y BUILDER_ANDROID_NINJA=y ANDROID_PLATFORM_VERSION="${ANDROID_VERSION}" "$@"
 fi
 
 if [ $MENU -eq 1 ] ; then