Merge "Avoid building CreateTimeZoneDistro for target"
diff --git a/distro/installer/Android.bp b/distro/installer/Android.bp
index e954c8f..75c1939 100644
--- a/distro/installer/Android.bp
+++ b/distro/installer/Android.bp
@@ -27,7 +27,7 @@
srcs: ["src/test/**/*.java"],
static_libs: [
"time_zone_distro",
- "time_zone_distro_tools",
+ "time_zone_distro_builder",
"time_zone_distro_installer",
"tzdata-testing",
"junit",
diff --git a/distro/installer/src/test/com/android/timezone/distro/installer/TimeZoneDistroInstallerTest.java b/distro/installer/src/test/com/android/timezone/distro/installer/TimeZoneDistroInstallerTest.java
index da9f671..bdbbc70 100644
--- a/distro/installer/src/test/com/android/timezone/distro/installer/TimeZoneDistroInstallerTest.java
+++ b/distro/installer/src/test/com/android/timezone/distro/installer/TimeZoneDistroInstallerTest.java
@@ -19,7 +19,7 @@
import com.android.timezone.distro.FileUtils;
import com.android.timezone.distro.StagedDistroOperation;
import com.android.timezone.distro.TimeZoneDistro;
-import com.android.timezone.distro.tools.TimeZoneDistroBuilder;
+import com.android.timezone.distro.builder.TimeZoneDistroBuilder;
import junit.framework.TestCase;
diff --git a/distro/tools/Android.bp b/distro/tools/Android.bp
index ab87adb..0495983 100644
--- a/distro/tools/Android.bp
+++ b/distro/tools/Android.bp
@@ -12,15 +12,24 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-// Library of tools classes for creating / interpreting time zone distros.
-// Used when generating distros and in host-side tests.
-java_library {
- name: "time_zone_distro_tools",
- host_supported: true,
+// The tool used to create time zone distro.zip files.
+java_library_host {
+ name: "create_time_zone_distro",
srcs: ["src/main/**/*.java"],
libs: [
"time_zone_distro",
],
+}
+
+// Code that can build a time zone distro.zip. Used in tests.
+java_library {
+ name: "time_zone_distro_builder",
+ host_supported: true,
+
+ srcs: ["src/main/**/builder/*.java"],
+ libs: [
+ "time_zone_distro",
+ ],
no_framework_libs: true,
}
diff --git a/distro/tools/create-distro.py b/distro/tools/create-distro.py
index f4d6a1c..ad665f6 100755
--- a/distro/tools/create-distro.py
+++ b/distro/tools/create-distro.py
@@ -33,10 +33,10 @@
def RunCreateTimeZoneDistro(properties_file):
# Build the libraries needed.
- subprocess.check_call(['make', '-C', android_build_top, 'time_zone_distro_tools',
+ subprocess.check_call(['make', '-C', android_build_top, 'create_time_zone_distro',
'time_zone_distro'])
- libs = [ 'time_zone_distro_tools', 'time_zone_distro' ]
+ libs = [ 'create_time_zone_distro', 'time_zone_distro' ]
host_java_libs_dir = '%s/../common/obj/JAVA_LIBRARIES' % android_host_out_dir
classpath_components = []
for lib in libs:
diff --git a/distro/tools/src/main/com/android/timezone/distro/tools/TimeZoneDistroBuilder.java b/distro/tools/src/main/com/android/timezone/distro/builder/TimeZoneDistroBuilder.java
similarity index 99%
rename from distro/tools/src/main/com/android/timezone/distro/tools/TimeZoneDistroBuilder.java
rename to distro/tools/src/main/com/android/timezone/distro/builder/TimeZoneDistroBuilder.java
index ed21aeb..4540608 100644
--- a/distro/tools/src/main/com/android/timezone/distro/tools/TimeZoneDistroBuilder.java
+++ b/distro/tools/src/main/com/android/timezone/distro/builder/TimeZoneDistroBuilder.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.timezone.distro.tools;
+package com.android.timezone.distro.builder;
import com.android.timezone.distro.DistroException;
import com.android.timezone.distro.DistroVersion;
diff --git a/distro/tools/src/main/com/android/timezone/distro/tools/CreateTimeZoneDistro.java b/distro/tools/src/main/com/android/timezone/distro/tools/CreateTimeZoneDistro.java
index b29fba7..06698ea 100644
--- a/distro/tools/src/main/com/android/timezone/distro/tools/CreateTimeZoneDistro.java
+++ b/distro/tools/src/main/com/android/timezone/distro/tools/CreateTimeZoneDistro.java
@@ -19,6 +19,7 @@
import com.android.timezone.distro.DistroVersion;
import com.android.timezone.distro.TimeZoneDistro;
+import com.android.timezone.distro.builder.TimeZoneDistroBuilder;
import java.io.File;
import java.io.FileInputStream;
