Commit Graph

551 Commits

Author SHA1 Message Date
Narayan Kamath
10e8235322 am 7d3b1cc2: am 4ebf0371: am 1e18a584: Merge "Whitelist libziparchive for windows."
* commit '7d3b1cc2cfec31110394ef5760f39d2570f327ed':
  Whitelist libziparchive for windows.
2013-12-11 21:10:02 +00:00
Narayan Kamath
4ebf03711a am 1e18a584: Merge "Whitelist libziparchive for windows."
* commit '1e18a584efe16cd387c603738c47c0591532e8d9':
  Whitelist libziparchive for windows.
2013-12-11 09:40:02 -08:00
Narayan Kamath
a4ea4f1843 Whitelist libziparchive for windows.
Change-Id: I19d527b6b52732057b16367574edc14c7065f256
2013-12-11 14:20:33 +00:00
Alexander Lucas
a4571dc351 am 607b0da6: am f044ac48: am b734f1b5: Updating sdk.atree to reflect new set of samples
* commit '607b0da6372cc033eb52684fbfd425c2298984b2':
  Updating sdk.atree to reflect new set of samples
2013-11-21 14:34:42 -08:00
Alexander Lucas
607b0da637 am f044ac48: am b734f1b5: Updating sdk.atree to reflect new set of samples
* commit 'f044ac485dd60ac075b31f81db3922b2d3780119':
  Updating sdk.atree to reflect new set of samples
2013-11-21 14:30:44 -08:00
Alexander Lucas
b734f1b590 Updating sdk.atree to reflect new set of samples
Change-Id: I1308d65f77783fc7f43fdc36bf90a59a137ec73f
2013-11-21 13:32:25 -08:00
Maurice Chu
7b433ee4e4 Move multidex support library
Multidex is being moved from frameworks/support/multidex to
frameworks/multidex.

GMS Core will be using the multidex library and has gotten special
approval to use the unreleased multidex library (i.e., guinea pig).

Bug: 10674263
Change-Id: Iff895425d4d7b2278641cbe147bd35d0788cadee
2013-11-12 09:37:43 +00:00
Siva Velusamy
3f12dac94d samples: Do not attempt to clean line endings for *.py DO NOT MERGE
The line endings script changes line endings, but also
removes the executable permissions of the files. We don't
want this to happen for scripts such as systrace.py

(cherry picked from commit de3fa5df07)

Change-Id: Icee78118d0d7367176e8561338ae547228ee087d
2013-10-09 18:16:06 -07:00
Siva Velusamy
0edb7add96 am f5eea9d9: am aeccc700: am 777285ce: Merge "samples: Do not attempt to clean line endings for *.py"
* commit 'f5eea9d9cb35df6c20a3b807ae36633bfc71f616':
  samples: Do not attempt to clean line endings for *.py
2013-10-09 15:10:19 -07:00
Siva Velusamy
f5eea9d9cb am aeccc700: am 777285ce: Merge "samples: Do not attempt to clean line endings for *.py"
* commit 'aeccc7000290f3f2edc59f9ff3a941df0d37ebc3':
  samples: Do not attempt to clean line endings for *.py
2013-10-09 15:07:11 -07:00
Siva Velusamy
aeccc70002 am 777285ce: Merge "samples: Do not attempt to clean line endings for *.py"
* commit '777285ceedba8cda5fb0fe0843fae6a887522c03':
  samples: Do not attempt to clean line endings for *.py
2013-10-09 15:02:49 -07:00
Siva Velusamy
de3fa5df07 samples: Do not attempt to clean line endings for *.py
The line endings script changes line endings, but also
removes the executable permissions of the files. We don't
want this to happen for scripts such as systrace.py

Change-Id: I355cbc4c77cfb3c90e4615962863288680389bce
2013-10-09 09:30:08 -07:00
Raphael Moll
377d341235 am 02e906ed: am 382966f3: am 47605d10: Merge "SDK Repository: switch to sdk addon revision 6."
* commit '02e906edf9838a9f9a6241d861e0b8ccddc677e5':
  SDK Repository: switch to sdk addon revision 6.
2013-10-01 18:45:53 -07:00
Raphael Moll
02e906edf9 am 382966f3: am 47605d10: Merge "SDK Repository: switch to sdk addon revision 6."
* commit '382966f30cdd800a1812d39b790cad8a04527157':
  SDK Repository: switch to sdk addon revision 6.
2013-09-30 16:19:38 -07:00
Raphael Moll
382966f30c am 47605d10: Merge "SDK Repository: switch to sdk addon revision 6."
* commit '47605d10f9647d21c3b350e944fe0d0f5efdc4e6':
  SDK Repository: switch to sdk addon revision 6.
2013-09-30 16:15:53 -07:00
Raphael Moll
7657a59083 SDK Repository: switch to sdk addon revision 6.
addon-6.xsd changes <extra><revision> from an int (major only)
to a full <revision> element with major.micro.minor (but not
preview part.)

Change-Id: Ia37e75a2c8f86f4ecf36edb218f7e243f66a0b36
2013-09-30 11:57:17 -07:00
Yohann Roussel
6fa1156b3b Add res folder to multidex SDK projects.
This will fix an error when importing thoses projects with ADT.

Change-Id: I75d2b0376222b13d630ef7e53386dedf62cc3fec
2013-09-12 07:51:54 +00:00
Yohann Roussel
6f57b24889 android-support-multidex-instrumentation in SDK.
Change-Id: I6e39034f592f6ad7654ee37970f3367a87b2034f
2013-09-11 08:05:14 +00:00
Deepanshu Gupta
4e21d52071 am a4a7f11e: am 7a63270e: am a3e0ada2: am 7c5fdf32: am 2c3e0af1: Merge "Add ICU jar to SDK" into jb-mr2-dev
* commit 'a4a7f11e117dec76d8a67477c99820d8bd83f3a0':
  Add ICU jar to SDK
2013-09-05 12:03:43 -07:00
Deepanshu Gupta
7a63270eb4 am a3e0ada2: am 7c5fdf32: am 2c3e0af1: Merge "Add ICU jar to SDK" into jb-mr2-dev
* commit 'a3e0ada25bb5fbd34fe6ade783bdb61469871ab8':
  Add ICU jar to SDK
2013-09-05 11:57:31 -07:00
Deepanshu Gupta
2c3e0af13c Merge "Add ICU jar to SDK" into jb-mr2-dev 2013-09-05 18:48:10 +00:00
Yohann Roussel
a9dd9cfb71 Merge "Add multidex ADT project to SDK." 2013-09-02 11:50:41 +00:00
Mike Lockwood
cd10458c78 Add frameworks/tools to windows SDK whitelist
Change-Id: Id418a8784339183bd6b8f5a0abb88b877b9b4ad7
2013-08-29 08:38:13 -07:00
Yohann Roussel
a6ca3cf29f Add multidex ADT project to SDK.
Change-Id: I7d622886441589002da55522ec391f19cae79da0
2013-08-22 18:34:41 +02:00
Yohann Roussel
9e27887b60 Include android-support-multidex in SDK libs.
Change-Id: I6d55e654cfc69276913d2d287211b474a5c3d00f
2013-08-21 14:21:57 +02:00
Trevor Johns
7fb77fa79a am 092959b2: am 1edc4427: am 6a3067db: Merge "Add common directory to BasicSyncAdapter sample" into jb-mr2-dev
* commit '092959b2a1d876511410cc6a85576545457d1037':
  Add common directory to BasicSyncAdapter sample
2013-08-15 15:26:29 -07:00
Trevor Johns
6a3067db20 Merge "Add common directory to BasicSyncAdapter sample" into jb-mr2-dev 2013-08-15 22:15:11 +00:00
Xavier Ducrohet
f6e246a835 am 40e5d9df: am bc516abe: am 8791785c: Package Renderscript files for support mode.
* commit '40e5d9df5f6f7936ef1b08cfe00d2dfe4c874c8e':
  Package Renderscript files for support mode.
2013-08-13 17:06:21 -07:00
Xavier Ducrohet
8791785cd0 Package Renderscript files for support mode.
Change-Id: I4eae052b01ae014f3e4d289ba33893dfd9c43309
2013-08-13 15:57:08 -07:00
Stephen Hines
87713ed9ad am c76a715f: am 295fc719: am 94efbd63: Add bcc_compat to sdk.atree to fix build break.
* commit 'c76a715ffab6582b12a3301f9e71fbdbb09fed0f':
  Add bcc_compat to sdk.atree to fix build break.
2013-08-08 14:13:59 -07:00
Stephen Hines
d2d3af652a am 6a368cd3: am 147fd9b2: am d50554a5: Add bcc_compat to list of required SDK product packages.
* commit '6a368cd3dc44bc6094687a6a77da91ecfc9e0d17':
  Add bcc_compat to list of required SDK product packages.
2013-08-08 14:13:54 -07:00
Stephen Hines
0aaada25aa am d18bec20: am 6ee70b1c: am 4483ade6: Add frameworks/rs and bcc_compat to windows SDK whitelist.
* commit 'd18bec202bf840aba8996c430a6fe7ba9af19a15':
  Add frameworks/rs and bcc_compat to windows SDK whitelist.
2013-08-07 13:18:55 -07:00
Stephen Hines
94efbd635d Add bcc_compat to sdk.atree to fix build break.
Change-Id: Iaccd5654aca64b249e9805844099fc4724b6b07e
2013-08-06 18:18:27 -07:00
Stephen Hines
d50554a5ca Add bcc_compat to list of required SDK product packages.
Change-Id: I890e6461672ffbaf589b72bac02d5c09ef2b370e
2013-08-06 17:41:46 -07:00
Alex Ray
8228c4e025 update win sdk whitelist with libutils
Change-Id: I4243eef2e8a251b8ba2397754de938709c57695e
2013-08-02 11:26:03 -07:00
Ying Wang
9ac7637a54 Fix win_sdk build.
libutils has been moved to system/core/libs/utils.

Change-Id: Ifd75fd7d5bac8aa24be876860eba030c3b5ae3fb
2013-07-31 20:14:50 -07:00
Stephen Hines
4483ade6b2 Add frameworks/rs and bcc_compat to windows SDK whitelist.
Change-Id: I81ff95e98bd827051336709d822f953295269d62
2013-07-31 17:54:37 -07:00
Xavier Ducrohet
583fc0990b Merge "Strip dynamic libraries to reduce size." into jb-mr2-dev 2013-07-25 21:49:41 +00:00
Xavier Ducrohet
cefd49aae6 Strip dynamic libraries to reduce size.
Change-Id: Ic43c7cc3dfca82e359abf8ef4c3259ac06eaa7dc
2013-07-25 14:48:26 -07:00
Xavier Ducrohet
67b7a3a3fc Merge "Remove .so from the windows build-tools." into jb-mr2-dev 2013-07-25 19:50:17 +00:00
Xavier Ducrohet
9368498dc3 Remove .so from the windows build-tools.
Change-Id: I7c8610a5c4aec36bcdf56607189e273944738124
2013-07-25 12:36:16 -07:00
Xavier Ducrohet
1fda188905 Merge "Add dynamic libraries for renderscript." into jb-mr2-dev 2013-07-25 19:30:53 +00:00
Xavier Ducrohet
afda1d33de Add dynamic libraries for renderscript.
The new llvm-rs-cc compiler is not statically linked
anymore so those libraries are needed.

Also add the new support stuff.

Change-Id: I4d56f0b07f0f0f120b512726689ae4ff07f38322
2013-07-25 12:24:21 -07:00
Trevor Johns
2a4aa3cd5d Remove AppRestrictions and BluetoothLeGatt samples
These have been moved to the new samples repository in
developers/samples/android.

Change-Id: I77312ea146ccb47ec8ecf38c9448149ec4c34962
2013-07-24 12:36:28 -07:00
Trevor Johns
da67d18b5b Add common directory to BasicSyncAdapter sample
This directory will be automatically copied over using a
templating system in the future, but for now it needs to
be copied in using sdk.atree.

This also allows us to remove the symlink that was checked
in previously, and which likely won't work on Windows.

Change-Id: If3d78eec7c1b845d1ae1caca59099d3284bdf73a
2013-07-24 12:31:16 -07:00
Raphael Moll
cea9fb7b4a Add bcc_compat to Windows whitelist.
Change-Id: I2b877d9fba8b0dc258a4dfd282bff0d21b77af0f
(cherry picked from commit 2fdc05f83e)
2013-07-23 23:53:05 +00:00
Trevor Johns
af0ab077f3 Remove samples/legacy from sdk.atree
This directory is only on my local machine, and doesn't
really exist. :)

Change-Id: Iea29b3f06fd089a5dca0f990cca058d9c2e7179b
2013-07-23 16:03:08 -07:00
Trevor Johns
1ffb35074a Add new sample tree to SDK build
Old samples will live in samples/${PLATFORM_NAME}/legacy.

New samples are sorted by category, and come from
developers/samples/android.

Change-Id: I573ba4f58d701eac4896ae795d041cae4b9a9794
2013-07-23 15:54:23 -07:00
Xavier Ducrohet
b7ed7bec1f Add support-v4 to the appcompat lib.
Change-Id: I2676ca4705e5dca15388e3759ba3a644fbae2b9b
2013-07-23 12:31:50 -07:00
Siva Velusamy
31cc1650cf Merge "Release systrace into platform-tools" into jb-mr2-dev 2013-07-22 20:53:51 +00:00