summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
...
| * add api level 9 'since' flag to docsScott Main2010-10-181-1/+2
| | | | | | | | Change-Id: Ia28ed9b4791cddfa0ee11b86c392dff7caca1dd8
| * Fix build.Nick Pelly2010-10-121-0/+8
| | | | | | | | | | | | I removed these by mistake, and incremental build failed to pick the failure. Change-Id: I19496d62a1eb1dc738a3a0b88d22ca1d5dddba96
| * NFC API revision round 2.Nick Pelly2010-10-121-8/+4
| | | | | | | | | | | | | | | | | | - Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag, RawTagConnection, NdefTagConnection. - Add implementations for all of the new NFC API. Change-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6 Signed-off-by: Nick Pelly <npelly@google.com>
* | Add missing NOTICE entries.David Deephanphongs2010-10-191-0/+4
| | | | | | | | | | | | | | | | Add missing NOTICE block for TagSoup in general NOTICE file. Add comment in Android.mk to help reviewers locate the NOTICE for apache-http. Modify build rule for 'am' command to pull in the NOTICE file. Change-Id: I43c6c1468395b70d0942b3620f12e4b6f3d9a66b
* | add api level 9 'since' flag to docsScott Main2010-10-191-0/+1
| | | | | | | | Change-Id: Idee873a20ae0f3f0a9705997c8b73ce7f181906f
* | NFC API revision round 2.Nick Pelly2010-10-141-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag, RawTagConnection, NdefTagConnection. - Add implementations for all of the new NFC API. Change-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6 Signed-off-by: Nick Pelly <npelly@google.com> Conflicts: Android.mk CleanSpec.mk core/java/android/app/ContextImpl.java
* | Remove the unused UrlRendererServiceBjorn Bringert2010-10-121-2/+0
| | | | | | | | Change-Id: I48af718d9753b475bd041147f0d18bee60da84ec
* | resolved conflicts for merge of f4c3b7e9 to masterNick Pelly2010-09-291-0/+8
|\ \ | |/ | | | | Change-Id: Idcdc521144f3072058b2bb6cb383e42c852e64f4
| * NFC integrationNick Pelly2010-09-281-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Source: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010) Conflicts: core/java/android/app/ApplicationContext.java core/java/android/provider/Settings.java core/jni/Android.mk core/jni/AndroidRuntime.cpp core/res/AndroidManifest.xml include/utils/Asset.h Change-Id: I62c92f4c79f5ee65126c97602f6bc1c15794e573 Signed-off-by: Nick Pelly <npelly@google.com>
* | resolved conflicts for merge of d78f338e to masterJesse Wilson2010-09-161-0/+1
|\ \ | |/ | | | | Change-Id: Ibe4be94126df9f1ea999b0396351886161552960
| * Add optional tags to frameworks/base ext.Jesse Wilson2010-09-161-1/+1
| | | | | | | | Change-Id: I08a69b7ca783994e52f735ad0ee9b85197cdaa96
| * DO NOT MERGE - Doclava warnings are now errors.Joe Onorato2010-09-161-2/+2
| | | | | | | | Change-Id: I688d8f66829d8526d76c321427dd701fbe8d1792
* | Make javadoc warnings into errors.Joe Onorato2010-09-161-2/+1
| | | | | | | | Change-Id: Ic2f98ffcc1568db5a3d5d97dd30de9d6dbfaf602
* | am 8ee9ecc1: am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." ↵Dirk Dougherty2010-09-161-15/+2
|\ \ | |/ | | | | | | | | | | | | | | into gingerbread Merge commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6' * commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6': Doc change: clean up droiddoc (cs) macros.
| * Doc change: clean up droiddoc (cs) macros.Dirk Dougherty2010-09-161-15/+2
| | | | | | | | Change-Id: I84b08a573fea42686a41ff694f1a52e8fb760dc5
| * DO NOT MERGE. Use the new -knowntags option to suppress warnings for some ↵Joe Onorato2010-09-161-1/+10
| | | | | | | | | | | | known tags. Change-Id: I4a04d9b182f2e644eb8d1966c33a0d280bf203e6
* | DO NOT MERGE. Use the new -knowntags option to suppress warnings for some ↵Joe Onorato2010-09-161-1/+10
| | | | | | | | | | | | known tags. Change-Id: Ifa46210d1e590e5298376539b6099452d85ef93d
* | am f9c7a3e2: am e71396cf: am 4b4af990: Doc change: update ADT 0.9.8 checksum ↵Dirk Dougherty2010-09-151-2/+2
|\ \ | |/ | | | | | | | | | | | | | | and size. Merge commit 'f9c7a3e25e6e83292051414246cb1fc0c5f85207' * commit 'f9c7a3e25e6e83292051414246cb1fc0c5f85207': Doc change: update ADT 0.9.8 checksum and size.
| * am 4b4af990: Doc change: update ADT 0.9.8 checksum and size.Dirk Dougherty2010-09-141-2/+2
| |\ | | | | | | | | | | | | | | | | | | Merge commit '4b4af990af527c79073d546ead1850278caa7a8e' into gingerbread * commit '4b4af990af527c79073d546ead1850278caa7a8e': Doc change: update ADT 0.9.8 checksum and size.
| | * Doc change: update ADT 0.9.8 checksum and size.Dirk Dougherty2010-09-141-2/+2
| | | | | | | | | | | | Change-Id: I610985683cd4608b075a22e8d8089de7896eb312
| * | Make @deprecated without a comment an error DO NOT MERGEJoe Onorato2010-09-101-1/+1
| | | | | | | | | | | | | | | | | | (do not merge because in master, this error has a different code 114 instead of 14) Change-Id: Iffc58423a8e972f3f59edfe6668beac4b65182e0
* | | Make @deprecated without comment an error.Joe Onorato2010-09-101-0/+1
| | | | | | | | | | | | Change-Id: Iaa5289fe7b48f0349fa9708c4f05144f6340b11c
* | | am eed5d17d: am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK ↵Dirk Dougherty2010-09-081-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Tools r7 and ADT 0.9.8." into froyo Merge commit 'eed5d17d7869e77495b9836118a4ffbd5c3ebf50' * commit 'eed5d17d7869e77495b9836118a4ffbd5c3ebf50': Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
| * | am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." ↵Dirk Dougherty2010-09-081-4/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit '3eb07ea483225974484c018d7d5affbf4815ceb2' into gingerbread * commit '3eb07ea483225974484c018d7d5affbf4815ceb2': Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
| | * Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.Dirk Dougherty2010-09-081-4/+4
| | | | | | | | | | | | Change-Id: I7cc8301e0160acd0adb3efbd20c6515ed985684f
* | | Update RecentApplications to use shared Carousel widget.Jim Miller2010-09-031-3/+0
| | | | | | | | | | | | Change-Id: I5ca7389aeca9ee6f03f48317f9d1034f9fb8c1ca
* | | Don't try to dist the stubs or comment check docs builds.Joe Onorato2010-09-011-0/+4
| | | | | | | | | | | | Change-Id: I0c567f28af8111cdb0eada30b8c0a30091967cd7
* | | am 1e1a030b: am 47471175: Can\'t have two rules building the stubs and ↵Joe Onorato2010-08-311-2/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | public.xml! Merge commit '1e1a030b502acae11dbd11d826d389351910a60f' * commit '1e1a030b502acae11dbd11d826d389351910a60f': Can't have two rules building the stubs and public.xml!
| * | Can't have two rules building the stubs and public.xml!Joe Onorato2010-08-311-2/+0
| | | | | | | | | | | | Change-Id: I27b113d436aa5f945c5d6d56258dbafdf71193cf
| * | DO NOT MERGE - Back port change from master that enforces correctness in the ↵Joe Onorato2010-08-311-0/+29
| | | | | | | | | | | | | | | | | | javadoc comments. Change-Id: I42956ccb3a32b3bd7c573bb2175e4ec230613dbf
* | | Clean up doc build to use Android custom doclava.Dirk Dougherty2010-08-301-8/+3
| | | | | | | | | | | | Change-Id: I1dcf18054aa128ffb4c66111c53fad20bcdee783
* | | Add another pass of the docs that nothing depends on that tries to parse ↵Joe Onorato2010-08-301-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some of the docs but without generating all of them. This should cut down on the number of sdk breakages. Change-Id: I947cc346bc525b05cc064c102171c4004303d7ed
* | | Clean up the messJoe Onorato2010-08-271-3/+1
| | | | | | | | | | | | Change-Id: Id3745d6e97d90443dcc0fd29fa047090c489adb3
* | | Fix MonkeyRunner SDK documentation generation.Bill Napier2010-08-251-3/+4
| | | | | | | | | | | | Change-Id: I53774cace908f5ac68e52cdfeec2c11cbdd7e11d
* | | Revert "Add support for generated documentation as part of the SDK docs."Mike Lockwood2010-08-251-3/+3
| | | | | | | | | | | | | | | | | | Fix the build This reverts commit e0dacf93b1a2d911d1c1a663ae6c66e0a211c14d.
* | | am 22518947: am bfc9325f: Merge "Add support for generated documentation as ↵Rohit Mungee2010-08-241-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | part of the SDK docs." into gingerbread Merge commit '2251894743f9e7b1ca7f546369c2ba7fc3d28e1f' * commit '2251894743f9e7b1ca7f546369c2ba7fc3d28e1f': Add support for generated documentation as part of the SDK docs.
| * | Add support for generated documentation as part of the SDK docs.Bill Napier2010-08-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This can be done by adding the list of files to include to the ALL_GENERATED_DOCS variable, and then making sure to put your generated output files under $(OUT_DOCS)/gen. Change-Id: Ie068a3fadccf7c990ec8e26b92ad408e7314469e
* | | am 63f05fe4: am bb75aa90: am ca9d51b1: Disabling AccessibilityService sample ↵Trevor Johns2010-08-241-2/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | from build system. Merge commit '63f05fe487d23e559e9d3f2c285d1c35aa75b9b3' * commit '63f05fe487d23e559e9d3f2c285d1c35aa75b9b3': Disabling AccessibilityService sample from build system.
| * | am ca9d51b1: Disabling AccessibilityService sample from build system.Trevor Johns2010-08-201-2/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'ca9d51b15074163521b140dce431cc3a10cb56fe' into gingerbread * commit 'ca9d51b15074163521b140dce431cc3a10cb56fe': Disabling AccessibilityService sample from build system.
| | * Disabling AccessibilityService sample from build system.Trevor Johns2010-08-201-2/+0
| | | | | | | | | | | | | | | | | | | | | This is necessary for an upcoming doc push. I'll revert this change after the doc push is complete. Change-Id: I32bbff7797cf5af1642da2b907b20847c1d17d21
* | | resolved conflicts for merge of 485de781 to masterKenny Root2010-08-241-4/+0
|\ \ \ | |/ / | | | | | | Change-Id: I483cb81596f09b024b1aea7fc55960183f38b24f
| * | Reorganize MountService IPCKenny Root2010-08-201-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove auto-generated AIDL files and replace them with manually edited .java and .cpp/.h files so that binder calls can be made from either Java or C++. Update the makefiles to not attempt to generate the AIDL files and also remove the old auto-generated .java files. Put all the storage-related C++ things in libstorage so that we don't pollute other libraries. Change-Id: I82d1631295452709f12ff1270f36c3100e652806
* | | Explicit warning level for deprecation mismatchBen Dodson2010-08-191-1/+1
| | | | | | | | | | | | Change-Id: I2ae784e61c4b4b7aa97d46080f78e9d4ab1df87f
* | | Fix 2797185: Integrate Carousel widget into framework.Jim Miller2010-08-181-0/+3
| | | | | | | | | | | | Change-Id: Ia03e3f582541dd7f6079929e51d2484b5b91a67b
* | | am 96e24634: am e6bfceeb: am 3b70e159: Merge "Adding a sample accessibility ↵Roman Nurik2010-08-171-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | service -make" into froyo Merge commit '96e24634c6db1a87285ca78d529dcc318653b7e9' * commit '96e24634c6db1a87285ca78d529dcc318653b7e9': Adding a sample accessibility service -make
| * | am 3b70e159: Merge "Adding a sample accessibility service -make" into froyoRoman Nurik2010-08-171-0/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '3b70e159a8168c1154d31d7b0552bb3b0c099334' into gingerbread * commit '3b70e159a8168c1154d31d7b0552bb3b0c099334': Adding a sample accessibility service -make
| | * Adding a sample accessibility service -makeSvetoslav Ganov2010-08-101-0/+2
| | | | | | | | | | | | Change-Id: I5bdd57e022b9907f7745046d8818801dbc3929a8
* | | am f5ee5358: am ac9717ab: Merge "Move OBB file reading to ↵Kenny Root2010-08-111-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | DefaultContainerService" into gingerbread Merge commit 'f5ee5358c187107b2e5a1e1fbcb5a648d793c798' * commit 'f5ee5358c187107b2e5a1e1fbcb5a648d793c798': Move OBB file reading to DefaultContainerService
| * | Move OBB file reading to DefaultContainerServiceKenny Root2010-08-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The system_server shouldn't touch files on the SD card. This change moves the things that touch the SD card out to the DefaultContainerService so that it will get killed if the SD card goes away instead of the system_server. Change-Id: I0aefa085be4b194768527195532ee6dddc801cfc
* | | Updated error codes for Doclava migrationBen Dodson2010-08-101-1/+1
| | | | | | | | | | | | Change-Id: Id8e8d0a47ae863cbdfb56569860fc0f56c644e97
generated by cgit v1.1 at 2025-02-05 08:21:47 +0000