Commit Graph

23 Commits

Author SHA1 Message Date
Wolfgang Wiedmeyer
5b2d5516ff
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_vendor_cm into replicant-6.0
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

Conflicts:
	overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.jpg
	overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.jpg
	overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg
	overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.jpg
2016-02-03 12:23:07 +01:00
herriojr
f0a6f1ec8b Fixed mmm For Maven APK
Maven APK (Why are these in maven anyways?) will crash due to it not
needing to generate a jack file.  This wasn't noticed before as brunch
succeeded, however, doing an mmm on one will cause this to fail. This
adds in logic to not generate a jack file for an apk in maven.

Change-Id: I44036bfd51ae3edd9437b153898b419ffc6ba2d6
2016-01-18 10:32:36 -08:00
herriojr
04864b10aa Fixed Maven Artifactory to work with jack
Prebuilts weren't generating their .jack file when doing an mm or mmm
but would work with a brunch or full make.  This makes it so mmm/mm
will properly generate it.

Change-Id: If5ccd1b557ef124b3c57fa09b172ec11caff886e
2016-01-15 16:58:02 -08:00
Wolfgang Wiedmeyer
cd55ab2858 Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_vendor_cm into replicant-6.0-toolchain 2016-01-14 15:27:42 +01:00
Adnan Begovic
d2bc6c2b69 cm: Fixup maven artifact publish inclusions.
TICKET: CYNGNOS-1529
Change-Id: Ie7307d43f0b38b179ae42b7c54a790bb7e4c5ea5
2016-01-05 20:12:23 -08:00
Adnan Begovic
4198cf685f cm: Modify maven artifact publish makefile.
Now allows you to specify a target module to be
  compiled prior to publish via LOCAL_MAVEN_TARGET_MODULE.

  This utilizes the definition for intermediates-dir-for on
  the target module after it sets an explicit dependency from
  remote to local module.

Change-Id: I65b5e07fdcc3368e350b1935ccca381b74dce59e
2016-01-05 17:36:46 -08:00
Wolfgang Wiedmeyer
a7da2325ef Merge remote-tracking branch 'cyanogenmod/cm-13.0' into replicant-6.0 2015-12-26 09:22:30 +01:00
Adnan Begovic
39ba595215 cm: Publish system api as part of publish process.
Change-Id: Iba8b2fbc43dfd7592d7526b03ce6e1338ea095d0
2015-12-23 12:38:15 -08:00
Wolfgang Wiedmeyer
71a01dce17 Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0
remove prebuilt terminal (built-in terminal app can be activated in dev settings)

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

Conflicts:
	CHANGELOG.mkdn
	CONTRIBUTORS.mkdn
	config/cdma.mk
	config/cm_audio.mk
	config/common.mk
	config/common_full.mk
	config/common_full_phone.mk
	config/gsm.mk
	config/themes_common.mk
	get-prebuilts
	overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.jpg
	overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.jpg
	overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg
	overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.jpg
	overlay/common/frameworks/base/core/res/res/values/config.xml
	overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
	prebuilt/common/bootanimation/1080.zip
	prebuilt/common/bootanimation/1200.zip
	prebuilt/common/bootanimation/240.zip
	prebuilt/common/bootanimation/320.zip
	prebuilt/common/bootanimation/360.zip
	prebuilt/common/bootanimation/480.zip
	prebuilt/common/bootanimation/540.zip
	prebuilt/common/bootanimation/600.zip
	prebuilt/common/bootanimation/720.zip
	prebuilt/common/bootanimation/768.zip
	prebuilt/common/bootanimation/800.zip
	prebuilt/common/etc/apns-conf.xml
	sepolicy/mac_permissions.xml
	sepolicy/sepolicy.mk
	vendorsetup.sh

Change-Id: I4fc2a5b00721cae8b3a36f33c36f006142bad44f
2015-12-17 18:24:03 +01:00
Adnan Begovic
62869cd7d6 vendor/cm: Don't be so noisy.
Change-Id: I3aa12c87b4b3e7f3da4fc4971659b981f460872a
2015-08-13 12:34:16 -07:00
Adnan Begovic
f192636b82 vendor/cm: Always use gpg sign-and-deploy for deployments.
- Also support LOCAL_MAVEN_SOURCES and LOCAL_MAVEN_JAVADOC

Change-Id: Icfab8d23d8a9e9993eb74adf7349439bc4b6d1ed
2015-08-07 13:28:56 -07:00
Adnan Begovic
44716fb0ee vendor/cm: Provide means of uploading an artifact to maven.
Change-Id: Ide225d75807a917773520ae1b7772e8de9b1ab73
2015-08-06 20:43:49 -07:00
Chris Sarbora
bf1bcdbc44 Specify the maven-dependency-plugin version directly so as to force Maven 3.0.5 to use the correct version.
Change-Id: Ia8b943feeb13d8835e0510404d067a2760608aa6
2015-07-25 17:54:15 -07:00
Adnan Begovic
4397d1d238 vendor/cm: Introduce update-cm-prebuilts-latest-public-api.
Change-Id: I6a09d3b26573c81e74dc0338ef8899bebb1b5320
2015-07-18 15:12:53 -07:00
Adnan Begovic
5dd3371ed8 vendor/cm: Clean up paths to known files.
Change-Id: I867300c04aae1f429be5e2bd057e559a00bc12b5
2015-07-18 15:12:28 -07:00
Chris Sarbora
9bf517f89d Hack in support for the old version of Maven that Ubuntu apparently ships with
Change-Id: I39094627ff114901cc49f792ab601ab5b1677c19
2015-07-16 18:54:08 -07:00
Chris Sarbora
b1f4115b47 Prevent Maven target from grabbing transitive dependencies
Dependencies of Maven targets will have to be managed manually. The prebuilt
target that the Maven target is based off of wasn't designed to handle multiple
artifacts per project. Additionally, this target is mainly intended for grabbing
APKs or other standalone blobs, not for pulling in a full jar dependency tree.
If that is your use case, you may want to investigate simply converting your
project to Gradle (or the Maven build system, if you can stomach it).

Change-Id: Iaf48c95c704cfdc85e0074394ff3c7464937e60c
2015-07-08 08:27:29 -07:00
Adnan Begovic
be48647b37 vendor/cm: Point to proper prebuilts/cmsdk directories.
Change-Id: I80ac94fd9b2d3a80d91a82d65a260d26b1436e60
2015-06-22 14:57:24 -07:00
Chris Sarbora
ea326686fb Support downloading from Maven
Change-Id: I94b8627a3bd15726cb4918b9a64b696f2a26e587
2015-06-19 20:52:45 +00:00
Adnan Begovic
ecc8b17853 cm: Point to the right files for checkapi-cm.
Change-Id: If67f1121add724e4b92e862fa3ec56002ba14382
2015-06-04 14:03:43 -07:00
Adnan Begovic
744a2571fd CM: Provide apicheck and cm-specific config inheritance.
Change-Id: Id5e488c5fb653bf2c330d2581d28a70971d56690
2015-06-04 18:08:07 +00:00
Adnan Begovic
b53c503fee Build CM Platform Library
Change-Id: If62e6b1d2ac41730ff2a8d562173abd2cb768f93

Add cmstatusbar service to system server services context

Change-Id: I77c5de75722cc5f36a5326e3da57ab661b89d189

Build Platform resource package.

Change-Id: Id60f66b6db23989db1472a19bcb079b0083f7393

vendor/cm: Lock cm platform library/cmsdk to non-release builds.

Change-Id: I01c1c3fe559d438e28339ce426d7ba7e42724002
2015-05-12 17:45:07 -07:00
Steve Kondik
ffe07b85eb cm: CM-specific build macros
* vendor/*/build/core/definitions.mk is automatically sourced by the
   build system to load custom macros. Start using this for some
   of our own.
 * Adds a "uniq" macro to remove duplicates from a list without changing
   it's order.

Change-Id: Id5f1eb4b9f81bb31ca0b3d5e74c298b3d105da10
2015-04-07 02:27:35 +00:00