aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "ndk: Add support for debugging on mips target"Siva Velusamy2012-05-183-21/+40
|\
| * ndk: Add support for debugging on mips targetSiva Velusamy2012-05-183-21/+40
| | | | | | | | Change-Id: I47cb9636192005d91166a6949c8b40ef88d0905f
* | Merge "SDK Manager: display options menu when invoked from IDE."Raphael Moll2012-05-184-39/+31
|\ \
| * | SDK Manager: display options menu when invoked from IDE.Raphael Moll2012-05-174-39/+31
| | | | | | | | | | | | Change-Id: I03c75be4d624f841c6f4c0ba93b0951bc8da8850
* | | Merge "SDK/ant: pass --ignore-assets flag to AAPT."Raphael Moll2012-05-182-2/+27
|\ \ \ | |_|/ |/| |
| * | SDK/ant: pass --ignore-assets flag to AAPT.Raphael Moll2012-05-172-2/+27
| | | | | | | | | | | | | | | | | | Requires change Ia4caa2a8 from frameworks/base.git Change-Id: Ifcb469a64146ac2ae65f8516ee9dcfb857a7e2aa
* | | Merge "ndk: use custom ndk gdb configuration tab."Siva Velusamy2012-05-185-74/+384
|\ \ \ | |_|/ |/| |
| * | ndk: use custom ndk gdb configuration tab.Siva Velusamy2012-05-175-74/+384
| | | | | | | | | | | | | | | | | | | | | This patch removes CDT's debugger tab and uses a custom debug tab which provides only the options relevant to ndk-gdb. Change-Id: Ia5273334bc39e5f5908d2d6d0f7702fe4f0655ce
* | | Merge "SDK Manager: do not erase default java http proxy properties."Raphael Moll2012-05-173-7/+61
|\ \ \
| * | | SDK Manager: do not erase default java http proxy properties.Raphael Moll2012-05-173-7/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the sdk manager config file has no proxy port/host info, do not set the corresponding java properties to empty strings. This means if the sdk manager settings are empty, whatever is the default from Java OR from the Eclispe proxy settings will be used by the manager. Change-Id: I17bbc6faed4726fc4b6aa9b29ded7d698ed81283
* | | | Merge "Fix aapt handling for skipped files"Tor Norbye2012-05-171-2/+11
|\ \ \ \
| * | | | Fix aapt handling for skipped filesTor Norbye2012-05-161-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aapt occasionally emits a "Skipping <file>" message. ADT treated these error messages as a fatal error, adding an error marker and setting the exit status to fail. The reason for that is that aapt will generate this error message when it encounters files in the resource directory that start with the letter "_", which is an invalid resource name prefix. However, aapt *also* generates this error message when it encounters *benign* files, such as ".git", or emacs backup files such as "layout.xml~". Luckily, it includes the "type" of the file in the error message. This changeset looks at the file type, and ignores skipping file messages for benign file types. Change-Id: If735e19d2dca4327be06bde9c6dfdcb2c95d0196
* | | | | Merge "Add ant-glob to sdk_only_whitelist"Xavier Ducrohet2012-05-171-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add ant-glob to sdk_only_whitelistSiva Velusamy2012-05-171-0/+1
|/ / / / | | | | | | | | | | | | Change-Id: I641b0b7debb27ff29449173210346fedd6e05671
* | | | Merge "ADT Junit test: Check for array size before accessing items"Siva Velusamy2012-05-172-27/+29
|\ \ \ \
| * | | | ADT Junit test: Check for array size before accessing itemsSiva Velusamy2012-05-172-27/+29
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia6682382a445ca770691771f620a10b7d408c152
* | | | | Merge "Replace current complex delta visitor by pattern based ones."Xavier Ducrohet2012-05-1617-502/+527
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Replace current complex delta visitor by pattern based ones.Xavier Ducrohet2012-05-1617-502/+527
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build system relies on several different delta visitor that detect file changes to detect that needs to be rebuilt but the implementation of those files is based on going through folders recursively while keeping states. This is complex and prone to errors. The new mechanism is simply based on glob-pattern, relative to the project root. A set of predefined patterns stored in ChangedFileSet instance allow quick reuse. ChangeFileSetHelper stores those as well as allow creating others that are based on a project config (such as the output folder). This first CL replace the previous delta visitors in the PostCompilerBuilder. Replacing the ones in the PreCompilerBuilder will require a bit more work so I prefer splitting it in another CL. The code that runs the pattern recognition is coming from Ant and is stored in external/ant-glob. This is not all of Ant but a subset of the classes for our need. This CL does include a simple set of tests for the extracted Ant classes. Change-Id: I2ad1b116ffb29c9f4195d863d04f8812e87a31ca
* | | | Merge "Add lint check for duplicate activity registrations"Tor Norbye2012-05-164-1/+90
|\ \ \ \
| * | | | Add lint check for duplicate activity registrationsTor Norbye2012-05-164-1/+90
| | |/ / | |/| | | | | | | | | | Change-Id: Ia1b023979d2c817e13a67cd5f3f85c1ddd4f65a2
* | | | am caef4b1b: Merge "gltrace: Update trace control protocol."Siva Velusamy2012-05-161-0/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'caef4b1b2f6d560cca37820c86276fb90b832aa8': gltrace: Update trace control protocol.
| * | | Merge "gltrace: Update trace control protocol."Siva Velusamy2012-05-161-0/+3
| |\ \ \
| | * | | gltrace: Update trace control protocol.Siva Velusamy2012-05-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The trace control protocol requires that the size of the command be sent before the command itself. Change-Id: I75aa26289fcdb8cd23e1ee3a8a088b85599e186c
* | | | | am 9dac107d: Merge "Improve search of items into style for legacy layoutlibs."Xavier Ducrohet2012-05-162-12/+14
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '9dac107dda1fc6ea7ebbbcd9e0adddea20aa618e': Improve search of items into style for legacy layoutlibs.
| * | | | Merge "Improve search of items into style for legacy layoutlibs."Xavier Ducrohet2012-05-162-12/+14
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Improve search of items into style for legacy layoutlibs.Xavier Ducrohet2012-05-162-12/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Legacy versions uses the old API that doesn't specify the namespace of the attribute being queried. The implementation used the namespace of the style as the namespace of the attribute but this make little sense. At better implementation searches in the project's namespace and, if the attribute is not found, then searches in the framework namespace. Change-Id: Ief43ecd45f108162de2b1512027d4eedf2c132db
* | | | am 7911fa1e: Merge "Fix new config chooser for show-included-layouts"Tor Norbye2012-05-161-15/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '7911fa1ef67338907a2fb22d4fdb4203930a4549': Fix new config chooser for show-included-layouts
| * | | Merge "Fix new config chooser for show-included-layouts"Tor Norbye2012-05-161-15/+2
| |\ \ \
| | * | | Fix new config chooser for show-included-layoutsTor Norbye2012-05-161-15/+2
| |/ / / | | | | | | | | | | | | Change-Id: I5e0bd0367292b3ab5d3773d4904161a7884ecddf
| | | |
| \ \ \
*-. \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | Change-Id: Ifca7228078e9a44b6dae4551cb63ded749e606a6
| | * | | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-160-0/+0
| | |\ \ \
| | | * \ \ merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-150-0/+0
| | | |\ \ \
| * | | \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-160-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-150-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| / / / | | | |/ / /
| | | * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-080-0/+0
| | | |\ \ \
| | | | * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-04-260-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-04-250-0/+0
| | | | | |\ \ \
| | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-230-0/+0
| | | | | | |\ \ \
| | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-190-0/+0
| | | | | | | |\ \ \
| | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-180-0/+0
| | | | | | | | |\ \ \
| | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-170-0/+0
| | | | | | | | | |\ \ \
| | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-160-0/+0
| | | | | | | | | | |\ \ \
| | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-120-0/+0
| | | | | | | | | | | |\ \ \
| | | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-110-0/+0
| | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-090-0/+0
| | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-050-0/+0
| | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-040-0/+0
| | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-030-0/+0
| | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-020-0/+0
| | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-290-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \