Commit graph

824 commits

Author SHA1 Message Date
Ying Wang
33c11ac3f1 am e1f37ba0: am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo
Merge commit 'e1f37ba0cfb0bcd8c463d0d85ccbbbbec4cc5bc4' into gingerbread-plus-aosp

* commit 'e1f37ba0cfb0bcd8c463d0d85ccbbbbec4cc5bc4':
  Dist apkcerts.txt for unbundled builds
2010-07-29 10:30:13 -07:00
Ying Wang
e1f37ba0cf am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo
Merge commit '55edb20e246e88afd841f63725c647132d9aca17' into gingerbread

* commit '55edb20e246e88afd841f63725c647132d9aca17':
  Dist apkcerts.txt for unbundled builds
2010-07-29 10:27:45 -07:00
Ying Wang
55edb20e24 Merge "Dist apkcerts.txt for unbundled builds" into froyo 2010-07-29 10:21:15 -07:00
Xavier Ducrohet
4527075964 am e743c53b: Package ddmlib-prebuilt with CTS.
Merge commit 'e743c53b88faf35be47667b0252c881c7b32f856' into gingerbread-plus-aosp

* commit 'e743c53b88faf35be47667b0252c881c7b32f856':
  Package ddmlib-prebuilt with CTS.
2010-07-28 15:14:51 -07:00
Xavier Ducrohet
e743c53b88 Package ddmlib-prebuilt with CTS.
This ensures that CTS is using a compatible ddmlib.

Change-Id: Iff6d2bfec873949dfd07ccf758bf257350f11298
2010-07-28 11:07:31 -07:00
The Android Open Source Project
4e8e998ecc am 989fade3: am af44485f: merge from open-source froyo
Merge commit '989fade304ef5253b5b401f347e26f768d75f35f' into gingerbread-plus-aosp

* commit '989fade304ef5253b5b401f347e26f768d75f35f':
  Include Test Case List from CTS Project
2010-07-26 12:25:52 -07:00
The Android Open Source Project
989fade304 am af44485f: merge from open-source froyo
Merge commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10' into gingerbread

* commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10':
  Include Test Case List from CTS Project
2010-07-26 12:06:35 -07:00
The Android Open Source Project
af44485fe8 merge from open-source froyo
Change-Id: I6bac03b1f646ea171ee20f0e90d37f337d7987fa
2010-07-26 12:02:01 -07:00
Evan Charlton
606540b739 resolved conflicts for merge of f2bfa76c to gingerbread-plus-aosp
Change-Id: I67b9af3ef344cfa7502f780d82c1a3d8a1a33f6d
2010-07-26 08:53:19 -07:00
Ying Wang
efb2168266 Dist apkcerts.txt for unbundled builds
Change-Id: Ic381d846f020dc43f48f43581c0db5721f2e36f7
2010-07-23 16:42:13 -07:00
Evan Charlton
f2bfa76cf8 resolved conflicts for merge of 121a7873 to gingerbread
Change-Id: I7b5cecd4236f263c31d4af73d929ff6b5729089e
2010-07-23 12:21:48 -07:00
Evan Charlton
121a78733a Packages can specify where to find AndroidManifest.xml
By overriding LOCAL_MANIFEST_FILE, a package can now specify which
AndroidManifest.xml file to use. This also allows for AndroidManifest.xml to
be in a non-standard location, though that's not recommended.

Change-Id: Ib6d1baeef7601e5a93d4ce64d18883d45373fc12
2010-07-23 11:03:29 -07:00
Ying Wang
3986feae32 am ef5bf469: am bce4b75f: Add JNI_H_INCLUDE as default header search path
Merge commit 'ef5bf469fab7166373b10db6c88e6c3cf0e64217' into gingerbread-plus-aosp

* commit 'ef5bf469fab7166373b10db6c88e6c3cf0e64217':
  Add JNI_H_INCLUDE as default header search path
2010-07-22 17:52:01 -07:00
Ying Wang
ef5bf469fa am bce4b75f: Add JNI_H_INCLUDE as default header search path
Merge commit 'bce4b75fa7801fcb88c6a9ade9465806fe18d441' into gingerbread

* commit 'bce4b75fa7801fcb88c6a9ade9465806fe18d441':
  Add JNI_H_INCLUDE as default header search path
2010-07-22 17:49:13 -07:00
Ying Wang
bce4b75fa7 Add JNI_H_INCLUDE as default header search path
So that module Android.mk does not need to include it manually.
Also with this change, CL like https://android-git.corp.google.com/g/57887 is not needed.

Change-Id: I68fa73a00c76eb37a8142f35d7eeef79cf53c09b
2010-07-22 15:58:19 -07:00
Brian Muramatsu
fa3d88f884 Include Test Case List from CTS Project
Bug 2732160

Have the cts.mk include the test case list from CTS rather
than defining it in cts.mk. This permits CTS developers to
add new packages and applications without having to submit
multiple project changes to both the CTS and build projects
everytime.

Change-Id: I63d90ac4f5d9fc9a9aa0ff79a8bf9dfb1a79c822
2010-07-22 14:46:53 -07:00
The Android Open Source Project
85581a1ba8 merge from open-source master
Change-Id: Ide7fbe06d7f9c1a06827365f006ddc7a01ba4dab
2010-07-22 11:31:59 -07:00
Ying Wang
b96e8a8cc6 am d9dea715: am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo
Merge commit 'd9dea715e5841028b1a30aa3f357b05c9de3e8c7' into gingerbread-plus-aosp

* commit 'd9dea715e5841028b1a30aa3f357b05c9de3e8c7':
  add phony target "all_modules" and use it as make goal for "mm"/"mmm"
2010-07-22 11:06:26 -07:00
Ying Wang
163ce0f62f am ebf93bb5: am 75b28573: Fix sim build for unbundling native code
Merge commit 'ebf93bb5c4585e783813ed5fcc54fc02b80ea460' into gingerbread-plus-aosp

* commit 'ebf93bb5c4585e783813ed5fcc54fc02b80ea460':
  Fix sim build for unbundling native code
2010-07-22 11:06:23 -07:00
Ying Wang
d9dea715e5 am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo
Merge commit 'd5c217aca18726f0ed9f2ea034f750620d4bdf7d' into gingerbread

* commit 'd5c217aca18726f0ed9f2ea034f750620d4bdf7d':
  add phony target "all_modules" and use it as make goal for "mm"/"mmm"
2010-07-22 10:58:14 -07:00
Ying Wang
ebf93bb5c4 am 75b28573: Fix sim build for unbundling native code
Merge commit '75b28573fe739a10f0f91fab1ef916ddd1c0b91c' into gingerbread

* commit '75b28573fe739a10f0f91fab1ef916ddd1c0b91c':
  Fix sim build for unbundling native code
2010-07-22 10:58:12 -07:00
Ying Wang
d5c217aca1 Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo 2010-07-22 10:51:03 -07:00
Ying Wang
0188414bc6 add phony target "all_modules" and use it as make goal for "mm"/"mmm"
So that mm/mmm don't depend on phony target "files", which brings in
unwanted files for apps-only build.
Also allow "dist" for mmm.
Bug: http://b/issue?id=2811503

Change-Id: I2c0794aebd1d171d8a0f44eb8cda67855704d6bd
2010-07-20 16:18:16 -07:00
Jeffrey Chyan
7adbf97d11 Allow explicit warnings for projects
Enabled compiler warnings by default and then modified javac
command to include warnings only if a project's warning flag,
LOCAL_WARNINGS_ENABLE, is set to true.

Change-Id: I5111d16a862f3afaaf1dcba2f2c2b7fc072613f1
2010-07-20 15:32:21 -07:00
Ying Wang
75b28573fe Fix sim build for unbundling native code
NDK does not support sim build.

Change-Id: I57a09c0083126c57a99cf33c055edef3390d1c28
2010-07-16 11:34:36 -07:00
Joe Onorato
c8ae417bdc am b1c272a6: Do a full clean build because of the installclean improvement steps
Merge commit 'b1c272a670936322db5200d888ea8558eb266d6e' into gingerbread-plus-aosp

* commit 'b1c272a670936322db5200d888ea8558eb266d6e':
  Do a full clean build because of the installclean improvement steps
2010-07-15 17:05:21 -07:00
Joe Onorato
b1c272a670 Do a full clean build because of the installclean improvement steps
Change-Id: I8f8ec00667374cd1f5adad6ea4d737dac79be47f
2010-07-15 17:02:25 -07:00
Joe Onorato
90ef224f8f am e2c62252: Merge "Instrumentation links against the jar file for its app, so use that at the dependency." into gingerbread
Merge commit 'e2c622524116b49d5817fedf1d88e2bb1521a9ec' into gingerbread-plus-aosp

* commit 'e2c622524116b49d5817fedf1d88e2bb1521a9ec':
  Instrumentation links against the jar file for its app, so use that at the dependency.
2010-07-15 11:10:32 -07:00
Joe Onorato
84843e6843 am d7324cc3: Merge "Fix event-log-tags so we don\'t rebuild framework.jar because of an installclean." into gingerbread
Merge commit 'd7324cc356e9c67d878d156ca81928ab2ef220f5' into gingerbread-plus-aosp

* commit 'd7324cc356e9c67d878d156ca81928ab2ef220f5':
  Fix event-log-tags so we don't rebuild framework.jar because of an installclean.
2010-07-15 11:10:29 -07:00
Joe Onorato
a3b31fba91 am 2198ff81: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
Merge commit '2198ff81b98941e905f7e39616f5ca15effb5704' into gingerbread-plus-aosp

* commit '2198ff81b98941e905f7e39616f5ca15effb5704':
  The ICU data is no longer compiled directly into the shared library.
2010-07-15 11:10:26 -07:00
Joe Onorato
e2c6225241 Merge "Instrumentation links against the jar file for its app, so use that at the dependency." into gingerbread 2010-07-15 11:07:42 -07:00
Joe Onorato
d7324cc356 Merge "Fix event-log-tags so we don't rebuild framework.jar because of an installclean." into gingerbread 2010-07-15 11:07:35 -07:00
Joe Onorato
2198ff81b9 Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread 2010-07-15 11:07:30 -07:00
Joe Onorato
14d9515363 Instrumentation links against the jar file for its app, so use that at the dependency.
I don't remember exactly, but I think the dependencies for apps
were broken, and you couldn't reliably cause the java to be rebuilt
by depending just on the jar file-- you needed to depend on the
apk.  That isn't the case anymore, and relying on the apk means
that something built in out/target/common was depending on something
that's deleted by installclean.

With this change (and others), on my mac, the build after
installclean for passion-eng takes 2 minutes instead of 11.

Change-Id: Ib490f88292d591254013e07958961fc50ec2e3dc
2010-07-14 19:49:05 -07:00
Mathias Agopian
e80545f00d am 9967e9db: Merge "add an entry for the new libgui" into gingerbread
Merge commit '9967e9dbb82e982db67fcfc5412055f26b8721b4' into gingerbread-plus-aosp

* commit '9967e9dbb82e982db67fcfc5412055f26b8721b4':
  add an entry for the new libgui
2010-07-14 16:36:14 -07:00
Mathias Agopian
9967e9dbb8 Merge "add an entry for the new libgui" into gingerbread 2010-07-14 16:31:43 -07:00
Jean-Baptiste Queru
c70574add5 am 07523a19: am a0cb4666: Merge "merge from open-source froyo" into froyo
Merge commit '07523a191de568aba9753d4d12d1fe392feea497' into gingerbread-plus-aosp

* commit '07523a191de568aba9753d4d12d1fe392feea497':
  Build Accessibility Tests and APK
2010-07-14 11:32:07 -07:00
Jean-Baptiste Queru
07523a191d am a0cb4666: Merge "merge from open-source froyo" into froyo
Merge commit 'a0cb466645ccc88d4f6d1f83018d5a0daf2eec6a' into gingerbread

* commit 'a0cb466645ccc88d4f6d1f83018d5a0daf2eec6a':
  Build Accessibility Tests and APK
2010-07-14 11:29:08 -07:00
Jean-Baptiste Queru
a0cb466645 Merge "merge from open-source froyo" into froyo 2010-07-14 11:06:23 -07:00
Joe Onorato
b751053151 Fix event-log-tags so we don't rebuild framework.jar because of an installclean.
Produce an event logs tag file for everything we know about, in order
to properly allocate numbers.  Then produce a file that's filtered
for what's going to be installed.

Change-Id: Id0778aec0b4d045e8ff91ba2c9c8265e860eaba5
2010-07-14 10:22:54 -07:00
Mathias Agopian
b46f2c747c add an entry for the new libgui
libgui is for high level C++ frameworks, it can depend on the
binder (unlike libui).

Change-Id: I4a1ebc69284919c85dce03e1395578af2fd08aa8
2010-07-13 22:27:47 -07:00
Joe Onorato
53b3cadbba The ICU data is no longer compiled directly into the shared library.
Change-Id: I79accedc16d6e62a95c0ec6f08ad2538013cd0b3
2010-07-13 19:05:37 -07:00
Ying Wang
6c56dd64b2 am a9b02f0b: resolved conflicts for merge of a6bed2f7 to gingerbread
Merge commit 'a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13' into gingerbread-plus-aosp

* commit 'a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13':
  Add phony target dist_libraries
2010-07-13 19:02:25 -07:00
Ying Wang
a9b02f0bfe resolved conflicts for merge of a6bed2f7 to gingerbread
Change-Id: Ic9efcc70af22f15a1bb136f70a30db59dc629e03
2010-07-13 18:59:56 -07:00
Ying Wang
a6bed2f723 Merge "Add phony target dist_libraries" into froyo 2010-07-13 18:50:05 -07:00
Ying Wang
4a1addef83 am 90b1d3dc: am b6a1c180: Keep the crt start/end var name of sh consistent with other archs
Merge commit '90b1d3dcfece8eef53277cbcf0326deda9f16f09' into gingerbread-plus-aosp

* commit '90b1d3dcfece8eef53277cbcf0326deda9f16f09':
  Keep the crt start/end var name of sh consistent with other archs
2010-07-13 17:48:40 -07:00
Ying Wang
90b1d3dcfe am b6a1c180: Keep the crt start/end var name of sh consistent with other archs
Merge commit 'b6a1c1802961f40fe4736e80402f849968cd2563' into gingerbread

* commit 'b6a1c1802961f40fe4736e80402f849968cd2563':
  Keep the crt start/end var name of sh consistent with other archs
2010-07-13 17:46:29 -07:00
Ying Wang
b6a1c18029 Keep the crt start/end var name of sh consistent with other archs
So that the PRIVATE_ vars get values correctly.

Change-Id: I1eea67f02c5bab5018b3b5fd93904e1ee8643bf7
2010-07-13 17:41:14 -07:00
Ying Wang
90cf34c72e am f0f60cdd: resolved conflicts for merge of 1a08100f to gingerbread
Merge commit 'f0f60cdd8f4f74b2480774887606afdebec8d891' into gingerbread-plus-aosp

* commit 'f0f60cdd8f4f74b2480774887606afdebec8d891':
  Support to build native libraries with prebuilt NDK
2010-07-13 17:24:09 -07:00
Ying Wang
f0f60cdd8f resolved conflicts for merge of 1a08100f to gingerbread
Change-Id: I9e4183a1d5c0efb13de8655b9eb7c74d50b34cd7
2010-07-13 17:21:33 -07:00