summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Create telephony-common and mms-commonWink Saville2012-07-061-1/+1
| | | | | | | | | | | | | | | | | These have been created to reduce the size and complexity of frameworks/base. mms-common was created by moving all of frameworks/base/core/java/com/google/android/mms to: frameworks/opt/mms telephony-common was created by moving some of frameworks/base/telephony to: frameworks/opt/telephony Change-Id: I5613c1447dbe655c55f9ba499e453bb59a06c4c0
* am 9e38d6bf: Merge "This property is set when HAVE_SELINUX:=true during build."Ying Wang2012-07-031-0/+4
|\ | | | | | | | | * commit '9e38d6bf1bf78a00d8f4288e6444be358a70a692': This property is set when HAVE_SELINUX:=true during build.
| * This property is set when HAVE_SELINUX:=true during build.William Roberts2012-07-031-0/+4
| | | | | | | | | | | | | | | | | | | | This will provide a convenient method for determing build configuration when in the Java layer. For instance, this will be used in change id I69529fb7a3adfe31eccb16d79740fc4952ff5e68 to determine if the Settings app should display the SE Linux status. Change-Id: Idc8dff020aaac41649eac64f5fa8e311dabbc51f
* | am e42ed0ba: Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to ↵Ying Wang2012-06-292-10/+12
|\ \ | |/ | | | | | | | | | | main.mk" * commit 'e42ed0ba1571f20866609710ba7c73fd138c0405': Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
| * Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mkYing Wang2012-06-282-10/+12
| | | | | | | | | | | | | | | | Bug: 6754632 So the warning won't show up when you run lunch. Now the warning only shows when you do a clean build. Change-Id: I7876da783f059d390f0072df37d3ab0291589eb7
* | am 6e587f53: Merge "Profiling use aprof, enable by LOCAL_ENABLE_APROF or ↵Jean-Baptiste Queru2012-06-225-0/+43
|\ \ | |/ | | | | | | | | | | LOCAL_ENABLE_APROF_JNI" * commit '6e587f53152127370c6b45204f6529dd7b0ce32a': Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI
| * Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNIKito Cheng2012-06-155-0/+43
| | | | | | | | Change-Id: Ia95dc7318e17c0804867b22e239edccc5cbec0af
* | am 0872a010: Merge "More flexibility to keep/remove R.class in static Java ↵Ying Wang2012-06-193-10/+19
|\ \ | | | | | | | | | | | | | | | | | | library" into jb-dev * commit '0872a010659d20633f07f4ef54cf61f8e4b6e030': More flexibility to keep/remove R.class in static Java library
| * | More flexibility to keep/remove R.class in static Java libraryYing Wang2012-06-193-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Usually you don't need to set LOCAL_JAR_EXCLUDE_FILES in your Android.mk, if your static library is directly used by an app. - If your library will be included by another library that need reference the R/Manifest class, you can set LOCAL_JAR_EXCLUDE_FILES := none to keep the generated classes. - If your library includes another static library that has Android resource and you want to remove the generated classes carried by the static library, set: LOCAL_JAR_EXCLUDE_FILES := $(ANDROID_RESOURCE_GENERATED_CLASSES) With the LOCAL_JAR_EXCLUDE_FILES value "none", deprecate the old long variable LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY. Change-Id: I3b9ad5d66f0262f784feb09bc1537c5b01256258
* | | am 43ca4a45: Remove the user tag and legacy prebuilts for the srec modules.Ying Wang2012-06-182-19/+0
|\ \ \ | |/ / | | | | | | | | | * commit '43ca4a45a43e2084b5a40af90ff523b0417d31c0': Remove the user tag and legacy prebuilts for the srec modules.
| * | Remove the user tag and legacy prebuilts for the srec modules.Ying Wang2012-06-152-19/+0
| | | | | | | | | | | | Change-Id: I20d8ec8986e2da76fbab67d1f86f5d385bd87c47
* | | am 74aba614: Allow additional vendorsJean-Baptiste Queru2012-06-141-0/+2
|\ \ \ | |/ / | | | | | | | | | * commit '74aba61404f0c1ea8693d2959d81d8b5b1bdf5d4': Allow additional vendors
| * | Allow additional vendorsJean-Baptiste Queru2012-06-141-0/+2
| | | | | | | | | | | | | | | Bug: 6611375 Change-Id: I07a1c4e56a2c9fdb1f2c8426977f1a8db0e4d4bb
* | | resolved conflicts for merge of 572d0d7d to jb-dev-plus-aospJean-Baptiste Queru2012-06-131-1/+1
|\ \ \ | | |/ | |/| | | | Change-Id: I6c750adcf06457bf8a3b47423c990be6e9d23bbb
| * | Merge "x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3"Jean-Baptiste Queru2012-06-131-11/+7
| |\ \
| | * | x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3Bruce Beare2012-05-251-11/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I0576514621affefea86a14d419f428761a60e067 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | | | am d3d78a30: am a11ad6c2: Merge "gcc 4.6 requires --copy-dt-needed-entries"Jean-Baptiste Queru2012-06-121-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd3d78a30a4f8dd40fa055577ea2708ab34606cec': gcc 4.6 requires --copy-dt-needed-entries
| * | | Merge "gcc 4.6 requires --copy-dt-needed-entries"Jean-Baptiste Queru2012-06-121-0/+1
| |\ \ \
| | * | | gcc 4.6 requires --copy-dt-needed-entriesBruce Beare2012-05-251-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | Change-Id: Icc62106e0f2e96f4cd871bb4b3c46c7ca83cabec Author: Bruce Beare <bruce.j.beare@intel.com> Reviewed-by: Lu, Hongjiu <hongjiu.lu@intel.com>
* | | | am 79d39a30: am 874563f9: Merge "Fix generic build on Max OS X 10.7 Lion"Ying Wang2012-06-081-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '79d39a303e036dc70eccf2e2e7489fa0bbfd3a4b': Fix generic build on Max OS X 10.7 Lion
| * | | Fix generic build on Max OS X 10.7 LionSangWook Han2012-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recover variable build_mac_version which is removed on commit 644dc16 and added on commit 9ce06f1. Without this, ranlib libSDL.a is executed on Lion which causes build fail of emulator-arm. Change-Id: I06144a288921f8f968ef457999398c1b9152d4aa
* | | | am efe02ce9: add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java ↵Keun young Park2012-06-074-5/+27
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | build is OK in PDK * commit 'efe02ce9e00b9aebde7e9b32e81780d8de8f0dbd': add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
| * | | add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDKKeun young Park2012-06-074-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - three levels: not defined, sdk, platform - TARGET_BUILD_PDK_JAVA_PLATFORM gives the original meaning of java platform API supported for java.mk - remove libexif from user tag - libexif_jni is pulled from f/b/media Bug: 6623618 Change-Id: I5fa085bd10f43963350c57b7f885c700de8963e5
* | | | am b53a073d: am e375c940: Merge "SDK: Use "strip -x" for atree."Raphael Moll2012-06-071-0/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'b53a073ddb3a5036f41ea2956792991b7a46da02': SDK: Use "strip -x" for atree.
| * | | Merge "SDK: Use "strip -x" for atree."Raphael Moll2012-06-071-0/+1
| |\ \ \
| | * | | SDK: Use "strip -x" for atree.Raphael Moll2012-06-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes atree to accept an alternate command via the env var ATREE_STRIP and correctly splits it for execvp if it contains arguments. Change-Id: I8691bdc569bea3dddfde6249217dc305b6ef19f7
* | | | | am 3da13457: am 4b030617: Merge "XCode 4.3+ compatibility check-in"Ying Wang2012-06-071-0/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '3da13457cfa46cf7d46b57c00f387c7c310b2dba': XCode 4.3+ compatibility check-in
| * | | | XCode 4.3+ compatibility check-inAl Sutton2012-06-071-0/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | XCode 4.3 and later use a different location for SDKs. This check in ensures the build checks for the new location as well as the old one. Change-Id: I97884e5009f229f8b42e57a8feeb702b3a40a241 Signed-off-by: Al Sutton <al@funkyandroid.com>
* | | | am 6afbda9f: Merge "Clean common intermediate files if overlay changed" into ↵Ying Wang2012-06-063-6/+68
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | jb-dev * commit '6afbda9f07821deed6eb110247ab56fb47dfc775': Clean common intermediate files if overlay changed
| * | | Merge "Clean common intermediate files if overlay changed" into jb-devYing Wang2012-06-063-6/+68
| |\ \ \
| | * | | Clean common intermediate files if overlay changedYing Wang2012-06-043-6/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change cleans the packages' intermediate files if their overlays changed between incremental builds. If two builds have different overlay, they will have different R classes, and so the jar files in the common intermediate dirs can not be shared. Therefore incremental build can't be applied. This change detects the overlay changes on package's base. If a package's overlay is different from the previous build, its common intermediate dir is nuked. This makes broader incremental builds possible. Change-Id: I368610ebbbbc85a80f9aecd714ab22cd78da7f12
* | | | | am e534e2eb: am 47450542: Merge "Use Mac OS X SDK 10.6."Ying Wang2012-06-051-10/+6
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit 'e534e2eb2b5e79facf24c31eb2f60b8a0ee1f5b7': Use Mac OS X SDK 10.6.
| * | | | Use Mac OS X SDK 10.6.Ying Wang2012-06-051-10/+6
| | |_|/ | |/| | | | | | | | | | Change-Id: I8ca16db2fb93d350829e14f4339e7ece75a2fb54
* | | | am 90beb4f1: Add some known binary ownersJean-Baptiste Queru2012-06-051-0/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '90beb4f155f9e0a7508854ded5b2c3dd87d702f5': Add some known binary owners
| * | | Add some known binary ownersJean-Baptiste Queru2012-06-051-0/+3
| | |/ | |/| | | | | | | | | | Bug: 6611375 Change-Id: I082128ad15b277ced82c8530c17186842839a557
* | | am 28a18175: Don\'t use .. to reference the target file.Ying Wang2012-06-021-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '28a181759079c34f8776f98f553e56554b527069': Don't use .. to reference the target file.
| * | Don't use .. to reference the target file.Ying Wang2012-06-021-1/+1
| | | | | | | | | | | | Change-Id: I1d08db81c37853f5bf0bdf5dbe848634e6ae9f61
* | | am f97105ea: Merge "Fix rild running in Nakasi." into jb-devWink Saville2012-05-311-1/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'f97105ea898fd4ad83ca55e391c0d512e3497b9b': Fix rild running in Nakasi.
| * | Merge "Fix rild running in Nakasi." into jb-devWink Saville2012-05-311-1/+0
| |\ \
| | * | Fix rild running in Nakasi.Wink Saville2012-05-311-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The module rild is telephony specific, since Nakasi has no radio it shouldn't run rild. Changing the build system so rild is optional for products that don't have telephony support. Since rild is now optional, it is necessary to add it explicitly to the sdk build as the sdk build is special. Bug: 6463864 Change-Id: If944e051023b567807585fb91163a1e3f79c1024
* | | | am 36e4e050: Merge "add add-to-product-copy-files-if-exists for pdk" into jb-devKeun young Park2012-05-301-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '36e4e050ff52956fc4afe60c156e81c2016304c4': add add-to-product-copy-files-if-exists for pdk
| * | | Merge "add add-to-product-copy-files-if-exists for pdk" into jb-devKeun young Park2012-05-301-0/+4
| |\ \ \
| | * | | add add-to-product-copy-files-if-exists for pdkKeun young Park2012-05-301-0/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib35006824de81be31652bfff220bbe4e814869ce
* | | | | am 01efddb0: Make make make faster.Jeff Brown2012-05-301-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '01efddb0b8c641a9ebfd955173dd58e015fbe903': Make make make faster.
| * | | | Make make make faster.Jeff Brown2012-05-301-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Optimize common case of uniq-words where the word is not actually duplicated. Reduces make startup overhead. Change-Id: I1bee13bbd08a7b01248f4452283a64a724663d02
* | | | am 3e93aeae: add platform.zip from platform-java to distKeun young Park2012-05-291-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '3e93aeae10aa70ab64e78fbab0bb8741d0b04d99': add platform.zip from platform-java to dist
| * | | add platform.zip from platform-java to distKeun young Park2012-05-291-2/+2
| |/ / | | | | | | | | | Change-Id: I08e110edf70ef5ec313ee02e03803fa152f0aa6a
* | | am 82eb7082: Fix typo.Ying Wang2012-05-291-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '82eb7082aa9b7239770f1631211a3c18b6daacfe': Fix typo.
| * | Fix typo.Ying Wang2012-05-291-1/+1
| | | | | | | | | | | | Change-Id: Id4b619e3fff8d801c4662d9cb2719576c370a503
* | | am d8de82fb: ignore touch error happening from broken symbolic linkKeun young Park2012-05-251-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'd8de82fbca4371ccefb41e02ac737e3a153901b3': ignore touch error happening from broken symbolic link
generated by cgit v1.1 at 2025-03-24 12:20:36 +0000