From 003eb4915a50c86d092f092b0f739d9fdd14848f Mon Sep 17 00:00:00 2001
From: Po-Chien Hsueh <pchsueh@google.com>
Date: Thu, 15 Aug 2019 16:20:06 +0800
Subject: [PATCH] Move libgiftranscode.so to /product

libgiftranscode.so is a jni lib for Messaging app, which is usually
overridden by proprietary apps on shipping devices. We have moved
Messaging to /product. Now this CL move libgiftranscode.so too.

Bug: 138282284
Test: Open gif files with Messaging on aosp_crosshatch
Change-Id: Ic104ba8ec5c2258a28c8d19151a00f6c601b5f80
---
 CleanSpec.mk   | 2 ++
 jni/Android.mk | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 1391c1a..79e4ced 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -39,3 +39,5 @@
 # ************************************************
 
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/messaging)
+$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib/libgiftranscode.so)
+$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib64/libgiftranscode.so)
diff --git a/jni/Android.mk b/jni/Android.mk
index cb9a69c..6b349a8 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -32,4 +32,6 @@ LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter -Wno-switch
 LOCAL_SDK_VERSION := 19
 LOCAL_NDK_STL_VARIANT := c++_static # LLVM libc++
 
+LOCAL_PRODUCT_MODULE := true
+
 include $(BUILD_SHARED_LIBRARY)