2582465bb4
A race could occur when printing the list of Asset allocations for debugging purposes. Each Asset object would insert themselves into a global linked list on construction and remove themselves on destruction. Iterating the list and the insertion/remove operations all acquire a global lock. The race occurs after the Asset subclass destructor runs but before the Asset base class destructor runs, which performs the actual removal from the list. The vtable of the object being destroyed ends up pointing at the base Asset class' vtable, and during the iteration of the global list, a pure virtual method is called leading to an abort, since the wrong vtable is dereferenced. This change moves the insertion/removal of the Asset object into the global list to the concrete class, which adds some maintenance overhead but solves the problem. Bug:31113965 Test: make libandroidfw_tests Change-Id: I1a620897e5e04a8519ee247883bba0719b1fa6f3 (cherry picked from commit 0358efe4f76f42d9eea91600202a5ab0831d9cef)
86 lines
2.3 KiB
Makefile
86 lines
2.3 KiB
Makefile
#
|
|
# Copyright (C) 2014 The Android Open Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
|
|
# ==========================================================
|
|
# Setup some common variables for the different build
|
|
# targets here.
|
|
# ==========================================================
|
|
LOCAL_PATH:= $(call my-dir)
|
|
|
|
testFiles := \
|
|
AppAsLib_test.cpp \
|
|
Asset_test.cpp \
|
|
AttributeFinder_test.cpp \
|
|
ByteBucketArray_test.cpp \
|
|
Config_test.cpp \
|
|
ConfigLocale_test.cpp \
|
|
Idmap_test.cpp \
|
|
ResTable_test.cpp \
|
|
Split_test.cpp \
|
|
TestHelpers.cpp \
|
|
Theme_test.cpp \
|
|
TypeWrappers_test.cpp \
|
|
ZipUtils_test.cpp
|
|
|
|
androidfw_test_cflags := \
|
|
-Wall \
|
|
-Werror \
|
|
-Wunused \
|
|
-Wunreachable-code \
|
|
-Wno-missing-field-initializers \
|
|
|
|
# gtest is broken.
|
|
androidfw_test_cflags += -Wno-unnamed-type-template-args
|
|
|
|
# ==========================================================
|
|
# Build the host tests: libandroidfw_tests
|
|
# ==========================================================
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_MODULE := libandroidfw_tests
|
|
LOCAL_CFLAGS := $(androidfw_test_cflags)
|
|
LOCAL_SRC_FILES := $(testFiles)
|
|
LOCAL_STATIC_LIBRARIES := \
|
|
libandroidfw \
|
|
libutils \
|
|
libcutils \
|
|
liblog \
|
|
libz \
|
|
|
|
include $(BUILD_HOST_NATIVE_TEST)
|
|
|
|
# ==========================================================
|
|
# Build the device tests: libandroidfw_tests
|
|
# ==========================================================
|
|
ifneq ($(SDK_ONLY),true)
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_MODULE := libandroidfw_tests
|
|
LOCAL_CFLAGS := $(androidfw_test_cflags)
|
|
LOCAL_SRC_FILES := $(testFiles) \
|
|
BackupData_test.cpp \
|
|
ObbFile_test.cpp \
|
|
|
|
LOCAL_SHARED_LIBRARIES := \
|
|
libandroidfw \
|
|
libcutils \
|
|
libutils \
|
|
libui \
|
|
|
|
include $(BUILD_NATIVE_TEST)
|
|
endif # Not SDK_ONLY
|
|
|