OSDN Git Service

Revert "Fix issue with using locally defined attrs in a shared lib"
authorAdam Powell <adamp@google.com>
Wed, 1 Oct 2014 18:11:18 +0000 (18:11 +0000)
committerAdam Powell <adamp@google.com>
Wed, 1 Oct 2014 18:11:18 +0000 (18:11 +0000)
commit908c748096d855d47da2f5e20fd4d9d31d1e603c
tree8031415a8deef274fa5bc89ba5c9744d6378889b
parent5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6
Revert "Fix issue with using locally defined attrs in a shared lib"

This reverts commit 5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6.

The reverted commit caused issues loading resources supplied by static libraries.

Bug 17748356

Change-Id: I860a4f31451ee7c03c02974826472a67226b029f
core/jni/android_util_AssetManager.cpp
libs/androidfw/ResourceTypes.cpp
tests/SharedLibrary/lib/res/layout/main.xml [deleted file]
tests/SharedLibrary/lib/res/values/strings.xml
tests/SharedLibrary/lib/src/com/google/android/test/shared_library/ActivityMain.java