LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,502 Commits 2 Branches 0 Tags
c8ed8c25bc796cd82fb1df0ea100e320a542eeb3
Commit Graph

605 Commits

Author SHA1 Message Date
Ying Wang
c8ed8c25bc am bcfa67e5: am 1e1b10ac: Merge "Switch to SDK_HOST_ARCH" 
* commit 'bcfa67e56dd7862d085954d2c4b349f8199c3d28':
  Switch to SDK_HOST_ARCH
 2014-06-10 16:30:41 +00:00
Ying Wang
bcfa67e56d am 1e1b10ac: Merge "Switch to SDK_HOST_ARCH" 
* commit '1e1b10acd152ae67670587ef1682ba6a3ed8a66c':
  Switch to SDK_HOST_ARCH
 2014-06-10 16:28:00 +00:00
Ying Wang
1e1b10acd1 Merge "Switch to SDK_HOST_ARCH" 2014-06-10 16:26:22 +00:00
Raphael Moll
9cec99d954 am ea21b816: am 28748be7: Merge "Generate api-versions.xml for lint." 
* commit 'ea21b8169062fecf0bf32abafc5892ad3beb8238':
  Generate api-versions.xml for lint.
 2014-06-09 23:52:02 +00:00
Raphael Moll
ea21b81690 am 28748be7: Merge "Generate api-versions.xml for lint." 
* commit '28748be7e5a95ca32fd4b930be05ad4bdd365a43':
  Generate api-versions.xml for lint.
 2014-06-09 23:49:42 +00:00
Raphael Moll
4f8a38ed7a Generate api-versions.xml for lint. 
Depends on:
- tools/base      I747d27e998c6dbd61dd17c44bfc747c9542e33d1
- tools/buildSrc  I400f4b6c146836ba30e6e7985ca6c9894985a8cb
- prebuilts/tools Ia4b0c477cf6f4788de610be017a9f5b43d73486c

Change-Id: I3f791d5e1d0ea893cdb5969854d9ae99d5fbb5b7
 2014-06-09 15:59:58 -07:00
Ying Wang
e7db94431e Switch to SDK_HOST_ARCH 
SDK_HOST_ARCH will be x86 if we are doing 32-bit host multilib build,
in which HOST_ARCH is actually x86_64.

Bug: 13751317
Change-Id: I8b7893b10cc4d0e71076b3b3625ec2f352aa8602
 2014-06-09 15:03:04 -07:00
Raphael Moll
adcf12ed08 am 4000df93: am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder." 
* commit '4000df931bb1b0f9a9e37430212124a9c37e6972':
  Move SDK system-image source.prop_templates in their own folder.
 2014-06-04 21:58:54 +00:00
Raphael Moll
4000df931b am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder." 
* commit '6ab8ef21b8826b19e92a47f70d3ba30e04ba66cc':
  Move SDK system-image source.prop_templates in their own folder.
 2014-06-04 21:46:13 +00:00
Raphael Moll
6ab8ef21b8 Merge "Move SDK system-image source.prop_templates in their own folder." 2014-06-04 21:30:14 +00:00
Steve Moyer
23a8adf276 DO NOT MERGE: Add SmsTest and mege emulator smoke tests 
Picked Changes:
Add SMS test to verify emulator can receive sms from DDMS
Adding test tag to sms test
Add up to 6 10 second delays to wait for sms
Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest

Conflicts:
	build/sdk.atree

Change-Id: I1343c59418a69b2f5e1eb0c6cde54f2bc09300ac
 2014-06-04 09:55:31 -07:00
Raphael Moll
95a5c56c8f am 728f321c: Merge "Add Build-Tools runtime.properties file." 
* commit '728f321cb94220e1f7d1d72759b6c6b342152c15':
  Add Build-Tools runtime.properties file.
 2014-06-04 09:55:53 +00:00
Raphael Moll
26bcf6a511 Move SDK system-image source.prop_templates in their own folder. 
This allows to have a different rule to generate the source.properties
based on the templates and place them in a directory that depends on
the current target CPU ABI. In turn this prevents the build from
mixing different source.props when building different targets.

Change-Id: I4a1d9f47426c94f376947ddae8be9f5549331616
 2014-06-03 17:30:16 -07:00
Raphael Moll
37433ac223 Add Build-Tools runtime.properties file. 
Change-Id: I5addf44a2ea3dbb91df5a49f6fcb10e75047fa82
 2014-06-03 13:46:51 -07:00
Raphael Moll
e9555599da am 087ccb01: Merge "Fix SDK repo to prevent mixing different targets." 
* commit '087ccb01527d9d7e8981751639c65b1eb6369534':
  Fix SDK repo to prevent mixing different targets.
 2014-06-03 02:56:09 +00:00
Raphael Moll
087ccb0152 Merge "Fix SDK repo to prevent mixing different targets." 2014-06-03 01:27:03 +00:00
Raphael Moll
4df9f469f7 Fix SDK repo to prevent mixing different targets. 
This makes sure that sdk-repo-*.zip doesn't exist to
avoid merging into an existing one.

Also fix a warning when generating the repo.xml files.

Change-Id: I645ad13936b83c5c33bd84c046b60b77488b9113
 2014-06-02 17:11:45 -07:00
Raphael Moll
267ddd50d7 am 937cfb42: am 6e56697c: Merge "Ability to generate SDK system-images for arm64 and x86_64" 
* commit '937cfb42602c081143e1854ba5f67e18b2f97b46':
  Ability to generate SDK system-images for arm64 and x86_64
 2014-05-28 01:59:48 +00:00
Raphael Moll
937cfb4260 am 6e56697c: Merge "Ability to generate SDK system-images for arm64 and x86_64" 
* commit '6e56697cb229cd8c163583a03259a6787f60a84a':
  Ability to generate SDK system-images for arm64 and x86_64
 2014-05-28 01:57:55 +00:00
Raphael Moll
4986fd4fdd Ability to generate SDK system-images for arm64 and x86_64 
(Cherry-picked from 40c7126e7c)

Change-Id: I2715a668271ed88fcd0c8c97ac35d05fcdd34a06
 2014-05-27 16:10:14 -07:00
Raphael Moll
f786331925 am 261307be: resolved conflicts for merge of bf164835 to stage-aosp-master 
* commit '261307bebe8986599055bb97d5587977c8da53eb':
  Fix SDK build.
 2014-05-20 23:35:46 +00:00
Raphael Moll
261307bebe resolved conflicts for merge of bf164835 to stage-aosp-master 
Change-Id: I3c380b1ddae5e088985513398d7eb6274d8426eb
 2014-05-20 16:29:29 -07:00
Raphael Moll
e9a7920ca4 Fix SDK build. 
development's sdk.atree depends on the generated file
/sdk/files/sdk_files_NOTICE.txt which was accumulating
all the tools notices.

However this file isn't generated anymore.
This replaces it by a static file.

This is only good as a temporary measure to fix the build.
The proper fix is to recreate the SDK rule to generate the
combined NOTICE.txt and move it in development.git

Change-Id: I27e4f38e756b81b002d16dfac5ccaa54a4463786
 2014-05-20 14:10:47 -07:00
Raphael Moll
7401fa161f am 8aa49aef: am f9f829e5: Merge "SDK: support generating repository XML with latest XSD." 
* commit '8aa49aef8adb24a1b977d89b60a48a781e4e6674':
  SDK: support generating repository XML with latest XSD.
 2014-05-16 20:12:42 +00:00
Raphael Moll
8aa49aef8a am f9f829e5: Merge "SDK: support generating repository XML with latest XSD." 
* commit 'f9f829e51afe3906458a81cb4efb75a051c64c04':
  SDK: support generating repository XML with latest XSD.
 2014-05-16 20:09:40 +00:00
Raphael Moll
ea40d2f4c5 SDK: support generating repository XML with latest XSD. 
The latest version of the repository XSD changes:
- archive attributes (os/arch) are now element (host-os)
- system images are not longer in the repository.xml and
  get their own XML file.

Change-Id: If5820a84d5c754b816b17b5713bbdb2597736eff
 2014-05-15 17:49:02 -07:00
Andrew Hsieh
106c0c694c am 3d34e652: am 7b004d96: Merge "Add libcxx projects and compiler-rt to windows whitelist." 
* commit '3d34e6524e035c6f55cac6553c73c7b18f9910c3':
  Add libcxx projects and compiler-rt to windows whitelist.
 2014-05-12 10:30:32 +00:00
Andrew Hsieh
3d34e6524e am 7b004d96: Merge "Add libcxx projects and compiler-rt to windows whitelist." 
* commit '7b004d960657c15145ce1272f7a61c8ca4272cd1':
  Add libcxx projects and compiler-rt to windows whitelist.
 2014-05-12 10:27:46 +00:00
Stephen Hines
d7d603fbbb Add libcxx projects and compiler-rt to windows whitelist. 
Change-Id: I2d6189b4e9a0440330d1212dae9396b88b66ea3f
 2014-05-09 14:45:58 -07:00
Xavier Ducrohet
6ee534bf5d am 557639cf: am 2567045c: Merge "Remove SDK tools from build." 
* commit '557639cf1167a32c9601a53fd70af7eb81413556':
  Remove SDK tools from build.
 2014-05-09 00:56:45 +00:00
Xavier Ducrohet
557639cf11 am 2567045c: Merge "Remove SDK tools from build." 
* commit '2567045c07dfae87fa53dfdc349681b5311d3522':
  Remove SDK tools from build.
 2014-05-09 00:52:33 +00:00
Xavier Ducrohet
ce00253c5b Remove SDK tools from build. 
(cherry picked from commit 1678734ef064893f28390fac16f4633d0fb7361a)

Change-Id: Ia689f66868de18341b863e19f2958434eb45ca59
 2014-05-08 14:49:09 -07:00
Xavier Ducrohet
40ad715f74 am 7fc13d7a: am 1cad9512: Merge "Fix repo script to ignore tools" 
* commit '7fc13d7ad63eb0fad3d30b4b909baca6651ee303':
  Fix repo script to ignore tools
 2014-05-08 19:36:30 +00:00
Xavier Ducrohet
7fc13d7ad6 am 1cad9512: Merge "Fix repo script to ignore tools" 
* commit '1cad951295f4b7bbd6edd8c1c5c7a791f7078033':
  Fix repo script to ignore tools
 2014-05-08 19:32:31 +00:00
Xavier Ducrohet
d81eb5d833 Fix repo script to ignore tools 
Change-Id: I80e6d5802f9a4633378d432eff3e91c2fcf83eeb
 2014-05-08 12:26:20 -07:00
Raphael Moll
438cc639d0 Revert "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE." 
This reverts commit 4a747f67b0.
 2014-05-05 14:57:16 -07:00
Raphael Moll
4a747f67b0 win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE. 
This deactivate building all the exe binaries
and prevents atree from running (both for dev.git
and sdk.git). This still results in a win_sdk folder
so that the sdk_repo rule can work, but the generated
sdk will only contain linux binaries and is not to be
used for production, obviously.

Change-Id: I99cd27a050278afae3b62d1ef34a0a1a542bfd1a
 2014-05-03 19:07:57 +00:00
Raphael Moll
257a315e72 am 304c8070: am a783fe5f: Merge "Temporarily disable rs/bcc in win_sdk" 
* commit '304c80705867d34b3323350a2cf0412e2931f6d0':
  Temporarily disable rs/bcc in win_sdk
 2014-05-03 00:08:04 +00:00
Raphael Moll
304c807058 am a783fe5f: Merge "Temporarily disable rs/bcc in win_sdk" 
* commit 'a783fe5f2c4e053b92b51ea1725fb535eaae7b0b':
  Temporarily disable rs/bcc in win_sdk
 2014-05-03 00:04:52 +00:00
Raphael Moll
c63c2d31ba Temporarily disable rs/bcc in win_sdk 
Change-Id: Ic3c49f14098662c83167151a2abc7f46d847c67f
 2014-05-02 12:21:17 -07:00
Bill Yi
23f68632c7 Merge commit 'd297be2136209cab4edbcf8879520f65fb564103' into HEAD 2014-04-29 11:33:09 -07:00
Alexander Lucas
5bf3d5236c am fd5ede91: am f5d4c15b: Added swipe-to-refresh samples to sdk.atree 
* commit 'fd5ede91e7900da3bbc20b9ef0ca3859ec499e01':
  Added swipe-to-refresh samples to sdk.atree
 2014-04-11 22:31:42 +00:00
Alexander Lucas
f5d4c15b0b Added swipe-to-refresh samples to sdk.atree 
Change-Id: If939f14e90c04d2df8bbe683812d2f01ef5f3399
 2014-04-11 15:20:55 -07:00
Alexander Lucas
ad5f0e867b am eb72a600: am 4a25165a: Merge "Updated Samples metadata for April push of samples" into klp-docs 
* commit 'eb72a6002c8ebdeeb94e432dadc828d7d158cbf2':
  Updated Samples metadata for April push of samples
 2014-04-11 20:29:54 +00:00
Alexander Lucas
c7ad654960 Updated Samples metadata for April push of samples 
Change-Id: Ie4136c1cb9051bead3c73a93ccf646577d721a50
 2014-04-11 13:21:11 -07:00
Xavier Ducrohet
f3ff0296c9 Move ZipAlign to build-tools. DO NOT MERGE. 
(cherry picked from commit 76510e2dd2)

Change-Id: I2262795c0dfe9b103fda8c9a50a80d688ece5a12
 2014-04-04 10:45:35 -07:00
Steve Moyer
0b1a1f7b38 Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests" 2014-04-04 16:32:00 +00:00
Steve Moyer
6ded79d696 DO NOT MERGE: Add SmsTest and mege emulator smoke tests 
Picked Changes:
Add SMS test to verify emulator can receive sms from DDMS
Adding test tag to sms test
Add up to 6 10 second delays to wait for sms
Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest

Conflicts:
	build/sdk.atree

Change-Id: I1343c59418a69b2f5e1eb0c6cde54f2bc09300ac
 2014-04-03 16:02:56 -07:00
Xavier Ducrohet
76510e2dd2 Move ZipAlign to build-tools. 
Change-Id: Id83a8dc86946bcde78e9eaaab009a06a59fccbd0
 2014-04-03 10:09:53 -07:00
Xavier Ducrohet
459fdbcee8 am dcb2c538: Add annotation support lib to SDK. 
* commit 'dcb2c538b88b84ba33dd2dd3a4afaab79a05608a':
  Add annotation support lib to SDK.
 2014-03-26 18:10:47 +00:00