From 805db15e4d7baa57062ad08fb03eeac8691475c8 Mon Sep 17 00:00:00 2001
From: Yohann Roussel <yroussel@google.com>
Date: Mon, 2 Mar 2015 10:54:52 +0100
Subject: Declare Jack multidex configuration

Change-Id: I807ab1791b1704b5b2ec48c608ac474e0d2b7850
---
 library/Android.mk                                 |  5 +--
 library/jack-meta/legacyMultidexInstallation.jpp   | 49 ++++++++++++++++++++++
 .../JACK-INF/legacyMultidexInstallation.jpp        | 49 ----------------------
 3 files changed, 50 insertions(+), 53 deletions(-)
 create mode 100644 library/jack-meta/legacyMultidexInstallation.jpp
 delete mode 100644 library/resources/JACK-INF/legacyMultidexInstallation.jpp

diff --git a/library/Android.mk b/library/Android.mk
index dd8a6ff..be549b3 100644
--- a/library/Android.mk
+++ b/library/Android.mk
@@ -36,9 +36,6 @@ $(ASMD_VERSION_INTERMEDIATE):
 
 LOCAL_JAVA_RESOURCE_FILES := $(ASMD_VERSION_INTERMEDIATE)
 
-# Use a dir because we have files in subfolders and we want to keep the path into the archive
-#
-# use "resources" instead of "res" because res is already used for packaging the SDK project
-LOCAL_JAVA_RESOURCE_DIRS := resources
+LOCAL_JACK_FLAGS:=--import-meta $(LOCAL_PATH)/jack-meta
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/library/jack-meta/legacyMultidexInstallation.jpp b/library/jack-meta/legacyMultidexInstallation.jpp
new file mode 100644
index 0000000..8a81eba
--- /dev/null
+++ b/library/jack-meta/legacyMultidexInstallation.jpp
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+
+multidexInstanciable:
+  @@com.android.jack.annotations.MultiDexInstaller
+  class *
+    is {
+      public
+    }
+    extends {
+        class android.app.Instrumentation
+      | class android.app.Activity
+      | class android.app.Service
+      | class android.content.ContentProvider
+      | class android.content.BroadcastReceiver
+      | class android.app.backup.BackupAgent
+      | class android.app.Application
+    }
+    do {
+      @@com.android.jack.annotations.MultiDexInstaller
+      method void <init>();
+    }
+
+multidexInstaller:
+  class *
+    is {
+      public
+    }
+    extends {
+      class android.app.Application
+    }
+    do {
+      @@com.android.jack.annotations.MultiDexInstaller
+      method void attachBaseContext(class android.content.Context)
+      ;
+    }
diff --git a/library/resources/JACK-INF/legacyMultidexInstallation.jpp b/library/resources/JACK-INF/legacyMultidexInstallation.jpp
deleted file mode 100644
index 8a81eba..0000000
--- a/library/resources/JACK-INF/legacyMultidexInstallation.jpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.
- */
-
-multidexInstanciable:
-  @@com.android.jack.annotations.MultiDexInstaller
-  class *
-    is {
-      public
-    }
-    extends {
-        class android.app.Instrumentation
-      | class android.app.Activity
-      | class android.app.Service
-      | class android.content.ContentProvider
-      | class android.content.BroadcastReceiver
-      | class android.app.backup.BackupAgent
-      | class android.app.Application
-    }
-    do {
-      @@com.android.jack.annotations.MultiDexInstaller
-      method void <init>();
-    }
-
-multidexInstaller:
-  class *
-    is {
-      public
-    }
-    extends {
-      class android.app.Application
-    }
-    do {
-      @@com.android.jack.annotations.MultiDexInstaller
-      method void attachBaseContext(class android.content.Context)
-      ;
-    }
-- 
cgit v1.2.3