commit 46ef1a7f578d20423961e6b989dad0524bcad13a
author Christopher Wiley <wiley@google.com> Mon Apr 18 17:40:56 2016 +0000
committer Christopher Wiley <wiley@google.com> Mon Apr 18 17:40:56 2016 +0000
tree 0b2a76160f161561c73f54fb24adc8dd55b2fbca
parent b12c5a67f9cf5a55f67c08bef898c48cefa9d03d

Revert "libbinder: Replace ScopedFd with base::unique_fd"

This reverts commit b12c5a67f9cf5a55f67c08bef898c48cefa9d03d.

Change-Id: I13ab8151376bc3bda7f96b92db7934720dc62215

libs/binder/Android.mk

diff --git a/libs/binder/Android.mk b/libs/binder/Android.mk
index 2483659..adb9674 100644
--- a/libs/binder/Android.mk
+++ b/libs/binder/Android.mk
@@ -44,8 +44,7 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libbinder
-LOCAL_SHARED_LIBRARIES := libbase liblog libcutils libutils
-LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libbase libutils
+LOCAL_SHARED_LIBRARIES := liblog libcutils libutils
 
 LOCAL_CLANG := true
 LOCAL_SANITIZE := integer
@@ -60,8 +59,7 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libbinder
-LOCAL_STATIC_LIBRARIES := libbase libutils
-LOCAL_EXPORT_STATIC_LIBRARY_HEADERS := libbase libutils
+LOCAL_STATIC_LIBRARIES += libutils
 LOCAL_SRC_FILES := $(sources)
 ifneq ($(TARGET_USES_64_BIT_BINDER),true)
 ifneq ($(TARGET_IS_64_BIT),true)