DO NOT MERGE - Merge Pie Bonito/Sargo into master.

Bug: 131756210
Change-Id: I6381f0300194fbe153b951eb30c5228b75de90c5
This commit is contained in:
Xin Li
2019-05-09 09:27:02 -07:00
2 changed files with 18 additions and 3 deletions

View File

@@ -1402,9 +1402,6 @@ endif
$(notice_target): | $(installed_static_library_notice_file_targets)
$(LOCAL_INSTALLED_MODULE): | $(notice_target)
$(notice_target): | $(installed_static_library_notice_file_targets)
$(LOCAL_INSTALLED_MODULE): | $(notice_target)
# Default is -fno-rtti.
ifeq ($(strip $(LOCAL_RTTI_FLAG)),)
LOCAL_RTTI_FLAG := -fno-rtti