OSDN Git Service

Merge "Make linking with libcompiler_rt conditional"
authorAlexey Polyudov <apolyudov@google.com>
Tue, 2 Aug 2016 22:17:24 +0000 (22:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 Aug 2016 22:17:24 +0000 (22:17 +0000)
am: 340c0c5701

Change-Id: Ide7cf834a0d981671f517366f7308c58d2a79163

1  2 
core/binary.mk
core/clear_vars.mk

diff --cc core/binary.mk
Simple merge
@@@ -143,8 -141,8 +143,9 @@@ LOCAL_DEX_PREOPT_FLAGS:
  LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,nano,full,nanopb-c,nanopb-c-enable_malloc
  LOCAL_PROTOC_FLAGS:=
  LOCAL_PROTO_JAVA_OUTPUT_PARAMS:=
 +LOCAL_VTSC_FLAGS:=
  LOCAL_NO_CRT:=
+ LOCAL_NO_LIBCOMPILER_RT:=
  LOCAL_NO_LIBGCC:=
  LOCAL_NO_PIC:=
  LOCAL_PROPRIETARY_MODULE:=