summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* am f1ee431f: add emma filter to make fileGuang Zhu2010-08-261-0/+7
|\ | | | | | | | | | | | | Merge commit 'f1ee431f3c9e6074ed308312867808490b1770f6' * commit 'f1ee431f3c9e6074ed308312867808490b1770f6': add emma filter to make file
| * add emma filter to make fileGuang Zhu2010-08-261-0/+7
| | | | | | | | | | | | | | so the code coverage report won't contain classes from local static Java libraries Change-Id: I039963fd2baff94bc9eed8f16a5d2b2786616e0c
* | add emma filter to make fileGuang Zhu2010-07-291-0/+7
| | | | | | | | | | | | | | so the code coverage report won't contain classes from local static Java libraries Change-Id: Iba77ec5464a2d7aa34b4b58734537d986cc6fb42
* | resolved conflicts for merge of 7109133e to masterJeff Hamilton2010-05-271-0/+2
|\ \ | |/ | | | | Change-Id: Ia0300d116a82a7b006aa863ae807153623c85c47
| * Add a PRE_BOOT_COMPLETED receiver.Jeff Hamilton2010-05-261-0/+2
| | | | | | | | | | | | | | | | | | | | It runs the first time after an OTA and either creates the database or runs the upgrade path on it. This may take a significatn amount of time so it's done before the boot animation completes. Bug: 2713849 Change-Id: I07f2c22a1462e6923cb7b060d561e7fb41a6e82d
* | Make ContactsProvider use a static version of vCard library.Daisuke Miyakawa2010-05-191-1/+1
|/ | | | | Bug: 2689523 Change-Id: If012a8aa061c6b3874e494779edb73c9e8e106b6
* Update to reflect android-common no longer in framework.Dianne Hackborn2010-02-251-0/+2
|
* Do not use a user tag on apps, as it is ignored.Jean-Baptiste Queru2010-01-051-1/+1
| | | | | | | | | | The build system does not honor user tags on apps, and setting it is misleading. This removes the confusion by making the makefiles behave like they read. Change-Id: Ia141dc1e5a3892bb344f319fc3d573e0ce160352
* Merge commit 'goog/eclair-dev' into merge3Evan Millar2009-07-081-1/+5
|\ | | | | | | | | | | | | | | | | | | Merged the new contacts content provider into goog/master. The old and new content providers now live side by side under separate authorities. Conflicts: Android.mk AndroidManifest.xml res/values/strings.xml
| * Change the makefile to not include the test code in the provider APK.Jeff Hamilton2009-05-041-1/+2
| |
| * First pass at new ContactsProvider.Jeff Hamilton2009-04-241-0/+16
| | | | | | | | | It's very basic right now, but shows the general layout that I'm thinking of for the schema and how the data types are defined. The test app just reads the display names and puts them in a list, not very useful since you have to add data with the sqlite3 tool for now.
* auto import from //branches/cupcake/...@137197The Android Open Source Project2009-03-091-1/+1
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+13
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-13/+0
|
* Initial ContributionThe Android Open Source Project2008-10-211-0/+13