1. seandroid
  2. Untitled project
  3. build

Commits

Stephen Smalley  committed 4edef18 Merge

Merge branch 'master' into seandroid

  • Participants
  • Parent commits 97cc4ef, cc68ce7
  • Branches seandroid

Comments (0)

Files changed (2)

File core/combo/arch/arm/armv7-a-neon.mk

View file
  • Ignore whitespace
 ARCH_ARM_HAVE_VFP_D32           := true
 ARCH_ARM_HAVE_NEON              := true
 
-ifeq ($(strip $(TARGET_CPU_VARIANT)), cortex-a15)
+ifeq ($(TARGET_CPU_VARIANT),$(filter $(TARGET_CPU_VARIANT),cortex-a15 krait))
 	arch_variant_cflags := -mcpu=cortex-a15
 else
 ifeq ($(strip $(TARGET_CPU_VARIANT)),cortex-a7)

File tools/signapk/SignApk.java

View file
  • Ignore whitespace
 
 
             if (signWholeFile) {
-                if (!"RSA".equalsIgnoreCase(privateKey[0].getAlgorithm())) {
-                    System.err.println("Cannot sign OTA packages with non-RSA keys");
-                    System.exit(1);
-                }
                 SignApk.signWholeFile(inputJar, firstPublicKeyFile,
                                       publicKey[0], privateKey[0], outputFile);
             } else {