[HACK] ADDITIONAL_SYSTEM_PROPERTIES is no more

Change-Id: Ib4925969f0d9f60ea5b30455806ff80a1817d61f

build/core/main_version.mk

@@ -1,13 +1,13 @@
 # Build fingerprint
-ifneq ($(BUILD_FINGERPRINT),)
-ADDITIONAL_SYSTEM_PROPERTIES += \
-    ro.build.fingerprint=$(BUILD_FINGERPRINT)
-endif
+#ifneq ($(BUILD_FINGERPRINT),)
+#ADDITIONAL_SYSTEM_PROPERTIES += \
+#    ro.build.fingerprint=$(BUILD_FINGERPRINT)
+#endif
 
 # tequilaOS System Version
-ADDITIONAL_SYSTEM_PROPERTIES += \
-    ro.tequila.version=$(TEQUILA_VERSION) \
-    ro.tequila.releasetype=$(TEQUILA_BUILDTYPE) \
-    ro.tequila.build.version=$(TEQUILA_PLATFORM_VERSION) \
-    ro.tequila.display.version=$(TEQUILA_DISPLAY_VERSION)
-    ro.modversion=$(TEQUILA_VERSION) \
+#ADDITIONAL_SYSTEM_PROPERTIES += \
+#    ro.tequila.version=$(TEQUILA_VERSION) \
+#    ro.tequila.releasetype=$(TEQUILA_BUILDTYPE) \
+#    ro.tequila.build.version=$(TEQUILA_PLATFORM_VERSION) \
+#    ro.tequila.display.version=$(TEQUILA_DISPLAY_VERSION) \
+#    ro.modversion=$(TEQUILA_VERSION) \

build/envsetup.sh

@@ -1,29 +1,3 @@
-function __print_tequila_functions_help() {
-cat <<EOF
-Additional tequilaOS functions:
-- cout:            Changes directory to out.
-- mmp:             Builds all of the modules in the current directory and pushes them to the device.
-- mmap:            Builds all of the modules in the current directory and its dependencies, then pushes the package to the device.
-- mmmp:            Builds all of the modules in the supplied directories and pushes them to the device.
-- tequilagerrit:   A Git wrapper that fetches/pushes patch from/to tequilaOS Gerrit Review.
-- tequilarebase:   Rebase a Gerrit change and push it again.
-- githubremote:    Add git remote for tequilaOS Github.
-- gerritremote:    Add git remote for tequilaOS Gerrit Review.
-- aospremote:      Add git remote for matching AOSP repository.
-- cloremote:       Add git remote for matching CodeLinaro repository.
-- mka:             Builds using SCHED_BATCH on all processors.
-- mkap:            Builds the module(s) using mka and pushes them to the device.
-- cmka:            Cleans and builds using mka.
-- repodiff:        Diff 2 different branches or tags within the same repo
-- repolastsync:    Prints date and time of last repo sync.
-- reposync:        Parallel repo sync using ionice and SCHED_BATCH.
-- repopick:        Utility to fetch changes from Gerrit.
-- sort-blobs-list: Sort proprietary-files.txt sections with LC_ALL=C.
-- installboot:     Installs a boot.img to the connected device.
-- installrecovery: Installs a recovery.img to the connected device.
-EOF
-}
-
 function mk_timer()
 {
     local start_time=$(date +"%s")

build/soong/bin/hmm

@@ -0,0 +1,25 @@
+function __print_tequila_functions_help() {
+cat <<EOF
+Additional tequilaOS functions:
+- cout:            Changes directory to out.
+- mmp:             Builds all of the modules in the current directory and pushes them to the device.
+- mmap:            Builds all of the modules in the current directory and its dependencies, then pushes the package to the device.
+- mmmp:            Builds all of the modules in the supplied directories and pushes them to the device.
+- tequilagerrit:   A Git wrapper that fetches/pushes patch from/to tequilaOS Gerrit Review.
+- tequilarebase:   Rebase a Gerrit change and push it again.
+- githubremote:    Add git remote for tequilaOS Github.
+- gerritremote:    Add git remote for tequilaOS Gerrit Review.
+- aospremote:      Add git remote for matching AOSP repository.
+- cloremote:       Add git remote for matching CodeLinaro repository.
+- mka:             Builds using SCHED_BATCH on all processors.
+- mkap:            Builds the module(s) using mka and pushes them to the device.
+- cmka:            Cleans and builds using mka.
+- repodiff:        Diff 2 different branches or tags within the same repo
+- repolastsync:    Prints date and time of last repo sync.
+- reposync:        Parallel repo sync using ionice and SCHED_BATCH.
+- repopick:        Utility to fetch changes from Gerrit.
+- sort-blobs-list: Sort proprietary-files.txt sections with LC_ALL=C.
+- installboot:     Installs a boot.img to the connected device.
+- installrecovery: Installs a recovery.img to the connected device.
+EOF
+}

build/soong/generator/generator.go

@@ -152,7 +152,7 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 				var path android.OptionalPath
 
 				if t, ok := module.(HostToolProvider); ok {
-					if !t.(android.Module).Enabled() {
+					if !t.(android.Module).Enabled(ctx) {
 						if ctx.Config().AllowMissingDependencies() {
 							ctx.AddMissingDependencies([]string{tool})
 						} else {