Stop including version_defaults.mk
version_defaults.mk is part of the core build system, and not
intended for including by modules. It is guaranteed to have
already been included before any Android.mk files have been
read. Including it twice causes HAS_BUILD_NUMBER to be set
to true which causes incremental rebuilds to reread all the
makefiles:
$(file <out/build_number.txt) was changed, regenerating...
Also fix the unnecessary $(info) messages that clutter the
build output.
Test: m nothing && m nothing
Change-Id: I9476642c65c6223af99761fdb8c89fb0b53198c7
diff --git a/gralloc960/Android.hikey960.mk b/gralloc960/Android.hikey960.mk
index b865bf1..5a1a958 100644
--- a/gralloc960/Android.hikey960.mk
+++ b/gralloc960/Android.hikey960.mk
@@ -15,8 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$(info gralloc for hikey960)
-
# GPU support for AFBC 1.0
MALI_GPU_SUPPORT_AFBC_BASIC=1
# GPU support for AFBC 1.1 block split
diff --git a/gralloc960/Android.juno.mk b/gralloc960/Android.juno.mk
index e2ecd4a..8423d2b 100644
--- a/gralloc960/Android.juno.mk
+++ b/gralloc960/Android.juno.mk
@@ -15,6 +15,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$(info gralloc for juno)
GRALLOC_FB_SWAP_RED_BLUE := 1
GRALLOC_DEPTH := GRALLOC_32_BITS
diff --git a/gralloc960/Android.mk b/gralloc960/Android.mk
index 0609226..35bdb8f 100644
--- a/gralloc960/Android.mk
+++ b/gralloc960/Android.mk
@@ -71,7 +71,6 @@
# HAL module implemenation, not prelinked and stored in
# hw/<OVERLAY_HARDWARE_MODULE_ID>.<ro.product.board>.so
include $(CLEAR_VARS)
-include $(BUILD_SYSTEM)/version_defaults.mk
ifeq ($(TARGET_BOARD_PLATFORM), juno)
ifeq ($(MALI_MMSS), 1)
diff --git a/gralloc960/Android.vexpress.mk b/gralloc960/Android.vexpress.mk
index 73ac119..69324e5 100644
--- a/gralloc960/Android.vexpress.mk
+++ b/gralloc960/Android.vexpress.mk
@@ -15,6 +15,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$(info gralloc for vexpress)
GRALLOC_FB_SWAP_RED_BLUE := 0
GRALLOC_DEPTH := GRALLOC_16_BITS
