commit adcb5df488d19ec174fc6e775f49775bfbd52e8e
author Gilles Debunne <debunne@google.com> Thu Apr 28 15:48:05 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 28 15:48:05 2011 -0700
tree 927ca1a21266143c9eba30bae643a7be932cd1d4
parent 39a01c66947cd56c80ff406c277d9debc0efa7cc
parent 3136bd34fe4b461743fd09b7615d191b457e8f3f

Merge "TextView's baseline is correctly computed for empty text."

libs/gui/Android.mk

diff --git a/libs/gui/Android.mk b/libs/gui/Android.mk
index 58bb0d3..b5737ff 100644
--- a/libs/gui/Android.mk
+++ b/libs/gui/Android.mk
@@ -38,3 +38,7 @@
 endif
 
 include $(BUILD_SHARED_LIBRARY)
+
+ifeq (,$(ONE_SHOT_MAKEFILE))
+include $(call first-makefiles-under,$(LOCAL_PATH))
+endif

libs/gui/SurfaceTexture.cpp

diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp
index 15a176e..2619629 100644
--- a/libs/gui/SurfaceTexture.cpp
+++ b/libs/gui/SurfaceTexture.cpp
@@ -100,6 +100,7 @@
     }
     sp<ISurfaceComposer> composer(ComposerService::getComposerService());
     mGraphicBufferAlloc = composer->createGraphicBufferAlloc();
+    mNextCrop.makeInvalid();
 }
 
 SurfaceTexture::~SurfaceTexture() {

libs/gui/tests/Android.mk

diff --git a/libs/gui/tests/Android.mk b/libs/gui/tests/Android.mk
index ecd0995..8d3a9b5 100644
--- a/libs/gui/tests/Android.mk
+++ b/libs/gui/tests/Android.mk
@@ -36,9 +36,6 @@
 
 include $(BUILD_EXECUTABLE)
 
-# Build the manual test programs.
-include $(call all-subdir-makefiles)
-
 endif
 
 # Include subdirectory makefiles