diff options
| author | Elliott Hughes <enh@google.com> | 2015-02-02 17:31:27 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-02-03 12:18:11 -0800 |
| commit | dec12b2b71ec73483f9a2267ee5717d7eb0cdf6d (patch) | |
| tree | cbf6a5bdca180427b5ec610c36ea239eae86b561 /libutils/Android.mk | |
| parent | b101f8795a3d3d1c1f5c403bafec93f3d90d0360 (diff) | |
| download | system_core-dec12b2b71ec73483f9a2267ee5717d7eb0cdf6d.zip system_core-dec12b2b71ec73483f9a2267ee5717d7eb0cdf6d.tar.gz system_core-dec12b2b71ec73483f9a2267ee5717d7eb0cdf6d.tar.bz2 | |
Add Google-style ReadFileToString and WriteStringToFile.
Bug: 19217569
Change-Id: I64789d3fa6777ee30a324cdf00fdc275c1230e1b
Diffstat (limited to 'libutils/Android.mk')
| -rw-r--r-- | libutils/Android.mk | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/libutils/Android.mk b/libutils/Android.mk index 52de910..701fe0e 100644 --- a/libutils/Android.mk +++ b/libutils/Android.mk @@ -14,9 +14,6 @@ LOCAL_PATH:= $(call my-dir) -# libutils is a little unique: It's built twice, once for the host -# and once for the device. - commonSources:= \ BasicHashtable.cpp \ BlobCache.cpp \ @@ -42,7 +39,8 @@ commonSources:= \ Tokenizer.cpp \ Unicode.cpp \ VectorImpl.cpp \ - misc.cpp + file.cpp \ + misc.cpp \ host_commonCflags := -DLIBUTILS_NATIVE=1 $(TOOL_CFLAGS) -Werror @@ -111,11 +109,6 @@ LOCAL_CFLAGS := -Werror include $(BUILD_SHARED_LIBRARY) -# Include subdirectory makefiles -# ============================================================ -# If we're building with ONE_SHOT_MAKEFILE (mm, mmm), then what the framework -# team really wants is to build the stuff defined by this makefile. -ifeq (,$(ONE_SHOT_MAKEFILE)) +# Build the tests in the tests/ subdirectory. include $(call first-makefiles-under,$(LOCAL_PATH)) -endif |