Commit Graph

2727 Commits

Author SHA1 Message Date
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
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
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 b1c272a670 Do a full clean build because of the installclean improvement steps
Change-Id: I8f8ec00667374cd1f5adad6ea4d737dac79be47f
2010-07-15 17:02:25 -07:00
Scott Main 81f42236e2 am 9269a711: docs: ensure code-ified links in qv are the proper color
Merge commit '9269a711753f2523acd3fe5ae661559f754a1bd0' into gingerbread

* commit '9269a711753f2523acd3fe5ae661559f754a1bd0':
  docs: ensure code-ified links in qv are the proper color
2010-07-15 16:43:38 -07:00
android-build SharedAccount 0958d77590 FRG15B
Change-Id: Ife2aad69ca5f79a53a85d486da8d7db552891dc4
2010-07-15 14:47:25 -07:00
android-build SharedAccount ed37e366d5 FRG15
Change-Id: I7ae45fe90f1570b9d4f5a44856be6e37a9c9cc43
2010-07-15 11:50:11 -07:00
Scott Main 9269a71175 docs: ensure code-ified links in qv are the proper color
Change-Id: I61dd859e0749573746c9bfcbf224758463370ba7
2010-07-15 11:21:56 -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 9967e9dbb8 Merge "add an entry for the new libgui" into gingerbread 2010-07-14 16:31:43 -07:00
android-build SharedAccount f1b46f6d04 FRG01B
Change-Id: Ifa90c748110a60cc2c6af8ced9249d66bed45f35
2010-07-14 13:43:00 -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 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 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 f0f60cdd8f resolved conflicts for merge of 1a08100f to gingerbread
Change-Id: I9e4183a1d5c0efb13de8655b9eb7c74d50b34cd7
2010-07-13 17:21:33 -07:00
Ying Wang 1a08100fa9 Support to build native libraries with prebuilt NDK
Bug: http://b/issue?id=2811253
Change-Id: Iabd4ab8b3d7236dffe89f1939e1142e882944026
2010-07-13 16:29:18 -07:00
The Android Open Source Project 0e4c0267fb merge from open-source froyo
Change-Id: I2759c464efef13754154310d10816a5781243311
2010-07-13 15:24:07 -07:00
Ying Wang 0d205521ae Merge "Enforce 64-bit build environment" into gingerbread 2010-07-09 13:30:14 -07:00
Brian Muramatsu 36b332beca Build Accessibility Tests and APK
Bug 2814482

Froyo's cts.mk was missing two lines added to Eclair's cts.mk that
are needed to build the accessibility tests and apk.

Change-Id: I05f93bc0a56b2ec1e07eab8c7a15ef7d4bb90d18
2010-07-08 13:05:09 -07:00
android-build SharedAccount f2987c4d80 FRG08
Change-Id: I49aabebfdebc376e10dd7b6ed7dda80b054d7c60
2010-07-08 12:00:07 -07:00
Scott Main 38d2e1dacd am b66a5c05: docs: modify redirect link text
Merge commit 'b66a5c0574e14b838d9dc2497540ffc6cb73dc4f' into gingerbread

* commit 'b66a5c0574e14b838d9dc2497540ffc6cb73dc4f':
  docs: modify redirect link text
2010-07-08 11:42:13 -07:00
Scott Main b66a5c0574 docs: modify redirect link text
Change-Id: Ieb26c4278958624b9c7aa8795cd7a8cab87fafec
2010-07-08 11:34:45 -07:00
Ying Wang d2e830b9b4 Enforce 64-bit build environment
We will only support 64-bit build environment from now on.

Change-Id: Ic58cb3e06e7fc9cf19a65e6c05c26f12ff9886b7
2010-07-08 10:06:50 -07:00
Steve Howard de6a085764 Fix broken interaction of JarJar and Emma.
JarJar, like DX, can't handle the local var corruption that Emma
performs.  To fix this, I'm moving the JarJar step before the Emma
step.

Couple other minor changes:
* Improved the comment about emma hardcoding its output filename,
  since this took me about an hour to track down.
* Changed one line from "Copying $<" to "Copying $@".  It seems to be
  the convention that such lines print the destination, not the
  source, so I made it consistent.

Change-Id: I9f5c36b4f5af15daf15025b89860e942f15bb668
2010-07-07 18:46:45 -07:00
Ying Wang 8d9cbe557d Add phony target dist_libraries
that is only used to put your library into the dist dir when doing a full build.

Change-Id: I11e9dc15237086843ea4a00736c81ffc680ca12e
2010-07-07 16:57:28 -07:00
David Turner 2b8ba2fa20 Merge "Clean up warnings in soslim" into gingerbread 2010-07-07 14:14:19 -07:00
Steve Howard 750ac4f3a4 Manual merge of change 50994 from master (DO NOT MERGE)
Merging from master because I'm bringing my maps API work into
gingerbread.

Fix and enable JarJar in Java builds.

java.mk contained a target to enable JarJar in Java builds, but it was
being bypassed.  This change enabled JarJar as part of the build
process, and fixes a slight bug with the way it was set up.

Change-Id: I814e64eb30b41bf249a63d683c03040e2658fe0d
2010-07-01 19:52:04 -07:00
android-build SharedAccount dd9089aedb FRG01
Change-Id: I41da481bf1dafdbc9009ecc86a0545209df3b193
2010-07-01 14:10:35 -07:00
Ed Heyl 7d735133cd Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge
b/2590492 and requested again

Change-Id: I1f4efac2a8ca47f1b69761bb9233427e0ca0411d
2010-07-01 10:25:09 -07:00
Ying Wang ca88861ba6 am 783f449b: Don\'t copy apns-conf.xml for apps-only build
Merge commit '783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9' into gingerbread

* commit '783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9':
  Don't copy apns-conf.xml for apps-only build
2010-06-30 16:34:52 -07:00
Ying Wang 783f449bdc Don't copy apns-conf.xml for apps-only build
http://b/issue?id=2796939
This can fix commands mm and mmm in an unbundled branch.
The cause is that mm & mmm depends on phony target "files", which includes apns-conf.xml.

Change-Id: I72ce1c7c5ddfdcd3bbea5cb9645ca3a48ff8ac12
2010-06-30 15:21:27 -07:00
android-build SharedAccount cd99b68cb3 FRF81
Change-Id: I0be958683caa6458a5377b1265a7e3860122faad
2010-06-30 13:30:23 -07:00
Jean-Baptiste Queru 22d019b51d Merge "Change branch name to gingerbread, to match reality - DO NOT MERGE" into gingerbread 2010-06-30 08:58:32 -07:00
The Android Open Source Project 79a8c2e9de set up fast-forward from froyo-release to gingerbread
Change-Id: I91ef2a183f34b54405580498a3cab39ec6dc7f24
2010-06-29 14:34:16 -07:00
Ying Wang dd2c21550c am 0af605f3: Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo
Merge commit '0af605f3b6e759f480a5124dc6b338ec58e1d40c' into gingerbread

* commit '0af605f3b6e759f480a5124dc6b338ec58e1d40c':
  Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS
2010-06-29 09:28:56 -07:00
Ying Wang 0af605f3b6 Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo 2010-06-29 09:18:00 -07:00
Kenny Root afb36e7e86 Clean up warnings in soslim
Change-Id: I497745fe9701876272fdbe7a946622a40efffdd5
2010-06-26 22:43:55 -07:00