diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-04-18 16:54:55 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2012-04-20 13:43:53 -0700 |
| commit | dedd7eacb4e82ff09cc00516ad4ab5edd9f9bab5 (patch) | |
| tree | 36fee2660856de7bec3600d4ae398a5e4724d4de /build | |
| parent | 622512420652f1622a8d0ca9b64845e2a0288aa9 (diff) | |
| download | sdk-dedd7eacb4e82ff09cc00516ad4ab5edd9f9bab5.zip sdk-dedd7eacb4e82ff09cc00516ad4ab5edd9f9bab5.tar.gz sdk-dedd7eacb4e82ff09cc00516ad4ab5edd9f9bab5.tar.bz2 | |
Manifest merger in Ant build.
This merges the manifest of the libraries into the application's
manifest.
Change-Id: I425e7b75f71d3f50c6422cdb62bb5ec6811ce99d
Diffstat (limited to 'build')
| -rw-r--r-- | build/tools.atree | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/tools.atree b/build/tools.atree index 89401e2..16fdaf5 100644 --- a/build/tools.atree +++ b/build/tools.atree @@ -107,6 +107,8 @@ framework/mkidentity-prebuilt.jar tools/lib/mkidentity.jar framework/lint.jar tools/lib/lint.jar framework/lint_api.jar tools/lib/lint_api.jar framework/lint_checks.jar tools/lib/lint_checks.jar +framework/manifmerger.jar tools/lib/manifmerger.jar + # 3rd Party java libraries framework/commons-compress-1.0.jar tools/lib/commons-compress-1.0.jar @@ -162,6 +164,5 @@ framework/sdklib-tests.jar tests/libtests/sdklib-tests.jar framework/sdkuilib-tests.jar tests/libtests/sdkuilib-tests.jar framework/layoutlib_api.jar tests/libtests/layoutlib_api.jar #FIXME breaks build, manifmerger jar files not properly built -#framework/manifmerger.jar tests/libtests/manifmerger.jar #framework/manifmerger-tests.jar tests/libtests/manifmerger-tests.jar |