summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "load SYSTEM/build.prop into the info_dict" into jb-mr1-devDoug Zongker2012-08-172-22/+40
|\
| * load SYSTEM/build.prop into the info_dictDoug Zongker2012-08-162-22/+40
| | | | | | | | Change-Id: Ic747106ba11773ffc9c2eebc163cfd22b1d7a4d5
* | am 726d921a: am 45cd00cd: Merge "Install all host modules. Don\'t filter ↵Joe Onorato2012-08-171-3/+1
|\ \ | | | | | | | | | | | | | | | | | | out ones tagged "optional"" * commit '726d921a47cb1003bcf7ff84ae1d332dec86d674': Install all host modules. Don't filter out ones tagged "optional"
| * \ am 45cd00cd: Merge "Install all host modules. Don\'t filter out ones tagged ↵Joe Onorato2012-08-171-3/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | "optional"" * commit '45cd00cd9e2feec187a6253b95e866cd10dfa20a': Install all host modules. Don't filter out ones tagged "optional"
| | * \ Merge "Install all host modules. Don't filter out ones tagged "optional""Joe Onorato2012-08-171-3/+1
| | |\ \
| | | * | Install all host modules. Don't filter out ones tagged "optional"Joe Onorato2012-08-171-3/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I9b3a27a4c84ee748314e98603670eb939ae949e2
* | | | | am 763c0801: am 687bde38: Merge "Add all the host tools to the list of ↵Joe Onorato2012-08-171-1/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | prerequisites for the SDK." * commit '763c080198655782cc5700d6f53cce330ab7e008': Add all the host tools to the list of prerequisites for the SDK.
| * | | | am 687bde38: Merge "Add all the host tools to the list of prerequisites for ↵Joe Onorato2012-08-171-1/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | the SDK." * commit '687bde38891b6aa3796f52721d7498436ab45330': Add all the host tools to the list of prerequisites for the SDK.
| | * | | Merge "Add all the host tools to the list of prerequisites for the SDK."Joe Onorato2012-08-171-1/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Add all the host tools to the list of prerequisites for the SDK.Joe Onorato2012-08-171-1/+2
| | |/ / | | | | | | | | | | | | Change-Id: I3a3e4be8796f761119e29f3be64ad534e48c95ee
* | | | resolved conflicts for merge of fab83a3d to jb-mr1-devJoe Onorato2012-08-171-4/+4
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I97aff2be317fd10b68d933e65259ec48bd5ff6a1
| * | | am 3b4b11a4: Merge "Another error to warning"Joe Onorato2012-08-171-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '3b4b11a4701b64df5248e7d86c0c357954a2ca10': Another error to warning
| | * | Merge "Another error to warning"Joe Onorato2012-08-171-1/+1
| | |\ \
| | | * | Another error to warningJoe Onorato2012-08-171-1/+1
| | |/ / | | | | | | | | | | | | Change-Id: Ifbad63e3eb37d087d88a39e102b4239f305d0ee3
* | | | am 6b340ad0: am 7c945d24: Merge "Make error a warning for now"Joe Onorato2012-08-171-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '6b340ad06c90ad80894bce720075e05f31b8f4cb': Make error a warning for now
| * | | am 7c945d24: Merge "Make error a warning for now"Joe Onorato2012-08-171-1/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '7c945d249956ed3943585b8d417a51a598b175b3': Make error a warning for now
| | * | Merge "Make error a warning for now"Joe Onorato2012-08-171-1/+2
| | |\ \
| | | * | Make error a warning for nowJoe Onorato2012-08-171-1/+2
| | |/ / | | | | | | | | | | | | Change-Id: Idf18957fff2bb4ff31ca6d7d8d1c8d95847b4e00
* | | | resolved conflicts for merge of 5836d3b3 to jb-mr1-devJoe Onorato2012-08-1716-619/+758
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: If3d84a7439717ccf7723b3f79e934d73abbb3fea
| * | | am f72e34eb: Merge changes ↵Joe Onorato2012-08-1616-609/+748
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I9d3a3c16,I17b5d441,I29e27505,Ia5ca233e,I0a0b200b,I6f412ed4,I623821df,Ifec8e63e,I12d0a847,Idac551e5,I59a88027,I2498139d,I6bd93a87 * commit 'f72e34ebf49ed2a06fe9e37d134f2088e2c0c0e4': Move the old user tagged modules over to base.mk so mini and core both share them. More product debugging. build system changes for jb-aah-dev merge Fail when a non-vendor product references a vendor module. Remove support for user tags in the build system. List the user modules explicitly, and we can get rid of the support for the user tag! Dump the user tagged modules. host modules don't need LOCAL_MODULE_TAGS Don't give the user tag to host modules automatically. Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything. Add tool to parse make dependency info from new --deps flag. Use a more modern -j flag. make product-graph now filtered
| | * | Merge changes ↵Joe Onorato2012-08-1616-609/+748
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I9d3a3c16,I17b5d441,I29e27505,Ia5ca233e,I0a0b200b,I6f412ed4,I623821df,Ifec8e63e,I12d0a847,Idac551e5,I59a88027,I2498139d,I6bd93a87 * changes: Move the old user tagged modules over to base.mk so mini and core both share them. More product debugging. build system changes for jb-aah-dev merge Fail when a non-vendor product references a vendor module. Remove support for user tags in the build system. List the user modules explicitly, and we can get rid of the support for the user tag! Dump the user tagged modules. host modules don't need LOCAL_MODULE_TAGS Don't give the user tag to host modules automatically. Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything. Add tool to parse make dependency info from new --deps flag. Use a more modern -j flag. make product-graph now filtered
| | | * | Move the old user tagged modules over to base.mk so mini and core both share ↵Joe Onorato2012-08-163-132/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | them. Change-Id: I9d3a3c165fa56d4ca137b3c06e249e1deea6a1c5
| | | * | More product debugging.Joe Onorato2012-08-162-20/+256
| | | | | | | | | | | | | | | | | | | | Change-Id: I17b5d441e44ea39564263b32f963e2d3ac684232
| | | * | build system changes for jb-aah-dev mergeJoe Onorato2012-08-162-13/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: I29e27505a0d9f7cc2932f725bfe1c83d804388bc
| | | * | Fail when a non-vendor product references a vendor module.Joe Onorato2012-08-162-6/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia5ca233e9b11f64b72074f65899d3041cf955c4c
| | | * | Remove support for user tags in the build system.Joe Onorato2012-08-165-612/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not forbidden to say LOCAL_MODULE_TAGS := user, and if you don't say LOCAL_MODULE_TAGS, it now defaults to optional. Change-Id: I0a0b200bb6f1c7bf1fe3a89cdc8f69678617526c
| | | * | List the user modules explicitly, and we can get rid of the support for the ↵Joe Onorato2012-08-162-0/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user tag! Change-Id: I6f412ed4e08d784ed71ec170e870fcf30081963a
| | | * | Dump the user tagged modules.Joe Onorato2012-08-162-1/+29
| | | | | | | | | | | | | | | | | | | | Change-Id: I623821df3e48b358a6b898ccb13750f7dc54ddcf
| | | * | host modules don't need LOCAL_MODULE_TAGSJoe Onorato2012-08-161-1/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifec8e63eef512b281eb924ef92160e9e1bf97f6d
| | | * | Don't give the user tag to host modules automatically.Joe Onorato2012-08-163-8/+30
| | | | | | | | | | | | | | | | | | | | Change-Id: I12d0a84786e5bf2224efd8684526b6097e6105d7
| | | * | Add a phony "nothing" goal that reads the makefiles but doesn't try to build ↵Joe Onorato2012-08-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anything. Change-Id: Idac551e5c796321e993b94761f5cbf5b55c1a994
| | | * | Add tool to parse make dependency info from new --deps flag.Joe Onorato2012-08-161-0/+151
| | | | | | | | | | | | | | | | | | | | Change-Id: I59a88027d88cceee9f2933c84379612698952043
| | | * | Use a more modern -j flag.Joe Onorato2012-08-161-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I2498139dd41637a795ca43f830c952adb2856d83
| | | * | make product-graph now filteredJoe Onorato2012-08-162-5/+89
| | |/ / | | | | | | | | | | | | Change-Id: I6bd93a87902e20a24c1c58152fb578ef1f4cb208
* | | | am dfab95a1: (-s ours) Reconcile with jb-mr0-release jb-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * commit 'dfab95a150da3014794fc92006c7f44e635ce1f6': JRO03R JZO47 JRO03Q
| | | |
| | \ \
| *-. \ \ Reconcile with jb-mr0-release jb-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Ie56fbb34384a4cf7d00b2ce89fd69ec434396a05
| | | * | | JRO03RThe Android Automerger2012-08-161-1/+1
| | | | | |
| | | * | | JRO03QThe Android Automerger2012-08-161-1/+1
| | | | | |
| | * | | | JZO47The Android Automerger2012-08-161-13/+3
| | | | | |
| | * | | | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-08-160-0/+0
| | |\ \ \ \
* | | \ \ \ \ Merge "Don't include system/core/include/arch/<arch>/Android.mk for ↵Ying Wang2012-08-166-35/+38
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | apps-only build." into jb-mr1-dev
| * | | | | | | Don't include system/core/include/arch/<arch>/Android.mk for apps-only build.Ying Wang2012-08-166-35/+38
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6994483 Change-Id: I76c4d96264cf94a79d59fdeb52bb37c07a9458dd
* | | | | | | am d77d8906: am 6020d698: Merge "select.mk: Tune ccache options"Jean-Baptiste Queru2012-08-161-0/+17
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | * commit 'd77d8906b8fc4a6e2ecaf9bc5f5b84ddec6dbe7e': select.mk: Tune ccache options
| * | | | | am 6020d698: Merge "select.mk: Tune ccache options"Jean-Baptiste Queru2012-08-161-0/+17
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * commit '6020d698f51132cab374e6c96f7da4902f3aa84f': select.mk: Tune ccache options
| | * | | | Merge "select.mk: Tune ccache options"Jean-Baptiste Queru2012-08-161-0/+17
| | |\ \ \ \
| | | * | | | select.mk: Tune ccache optionsAndrew Boie2012-08-161-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With these adjustments, cached object files can now be shared across multiple Android trees on a single workstation: * Compiler binary modification time no longer causes cache misses, as a hash of the compiler binary is taken rather than looking at the mtime and size * Header file modification time no longer causes cache misses, the headers are now always hashed * Macros such as __DATE__ and __TIME__ no longer cause cache misses * All paths in preprocessed source (due to use of -g) are now relative These options require ccache 3.1 or later to be used; ccache 2.4 will ignore these. Change-Id: I7839637e9dacf7240bd9b7bfaa6406b1db423560 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | | | | | | Support to build emmap_mata.zip in unbundled builds.Ying Wang2012-08-162-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6987838 Change-Id: Id6c81b08c4859442b7d52054ed5f278575719d1a
* | | | | | | am 0fc8d635: am f2a618e1: Merge "The zoneinfo stuff is no longer legacy."Elliott Hughes2012-08-151-4/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '0fc8d635a7f3712cc24f7a29d97755bc15972a0a': The zoneinfo stuff is no longer legacy.
| * | | | | | am f2a618e1: Merge "The zoneinfo stuff is no longer legacy."Elliott Hughes2012-08-151-4/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'f2a618e1df126c6c48622cce948825e923b52dcb': The zoneinfo stuff is no longer legacy.
| | * | | | | Merge "The zoneinfo stuff is no longer legacy."Elliott Hughes2012-08-151-4/+1
| | |\ \ \ \ \
generated by cgit v1.1 at 2025-03-23 07:47:10 +0000