Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8063950e authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libandroid_runtime: RefBase strict mode" into main am: aa391eec am: ed994a58 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3474410



Change-Id: I8cee41bfe5f80b54e1ac8feb77ed20a17f77081a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents becc0610 ed994a58

core/jni/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ cc_library_shared_for_libandroid_runtime { 


        "-DU_USING_ICU_NAMESPACE=0",



        "-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",



        "-Wall",

        "-Werror",

        "-Wextra",

core/jni/android_content_res_ObbScanner.cpp

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#undef ANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION // TODO:remove this and fix code



#define LOG_TAG "ObbScanner"

core/jni/android_graphics_BLASTBufferQueue.cpp

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#undef ANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION // TODO:remove this and fix code



#define LOG_TAG "BLASTBufferQueue"

core/jni/android_graphics_GraphicBuffer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#undef ANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION // TODO:remove this and fix code



#define LOG_TAG "GraphicBuffer"

core/jni/android_graphics_SurfaceTexture.cpp

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#undef ANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION // TODO:remove this and fix code



#undef LOG_TAG

#define LOG_TAG "SurfaceTexture"