Skip to content
This repository has been archived by the owner on Nov 15, 2022. It is now read-only.

Commit

Permalink
Remove repeated newlines at the end of files.
Browse files Browse the repository at this point in the history
Change-Id: I1e3d103a7b932ef21acedb6438c0f26b315df28f
  • Loading branch information
Carl Shapiro committed Jun 9, 2010
1 parent de75089 commit 7365493
Show file tree
Hide file tree
Showing 594 changed files with 18 additions and 2,052 deletions.
1 change: 0 additions & 1 deletion dalvikvm/Main.c
Original file line number Diff line number Diff line change
Expand Up @@ -299,4 +299,3 @@ int main(int argc, char* const argv[])
/*printf("--- VM is down, process exiting\n");*/
return result;
}

1 change: 0 additions & 1 deletion dexdump/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,3 @@ endif

include $(BUILD_HOST_EXECUTABLE)
endif # !TARGET_SIMULATOR

1 change: 0 additions & 1 deletion dexdump/DexDump.c
Original file line number Diff line number Diff line change
Expand Up @@ -1893,4 +1893,3 @@ int main(int argc, char* const argv[])

return (result != 0);
}

1 change: 0 additions & 1 deletion dexdump/OpCodeNames.c
Original file line number Diff line number Diff line change
Expand Up @@ -327,4 +327,3 @@ const char* getOpcodeName(OpCode op)
{
return gOpNames[op];
}

1 change: 0 additions & 1 deletion dexlist/DexList.c
Original file line number Diff line number Diff line change
Expand Up @@ -291,4 +291,3 @@ int main(int argc, char* const argv[])
free(gParms.argCopy);
return result;
}

1 change: 0 additions & 1 deletion dexopt/OptMain.c
Original file line number Diff line number Diff line change
Expand Up @@ -485,4 +485,3 @@ int main(int argc, char* const argv[])
fprintf(stderr, "Usage: don't use this\n");
return 1;
}

1 change: 0 additions & 1 deletion docs/porting-proto.c.txt
Original file line number Diff line number Diff line change
Expand Up @@ -242,4 +242,3 @@ u4 const_c1e00000(u4 highword) { return 0xc1e00000; }
#ifdef __ARM_ARCH_7A__
# warning "found __ARM_ARCH_7A__"
#endif

1 change: 0 additions & 1 deletion dx/etc/dx.bat
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,3 @@ if "%params%"=="" goto endArgs
set javaOpts=%javaOpts% %defaultMx%

call java %javaOpts% -Djava.ext.dirs=%frameworkdir% -jar %jarpath% %args%

2 changes: 0 additions & 2 deletions dx/etc/run-opcode-gen
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,3 @@

./opcode-gen ../src/com/android/dx/dex/code/DalvOps.java
./opcode-gen ../src/com/android/dx/dex/code/Dops.java


1 change: 0 additions & 1 deletion dx/src/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@ LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_IS_HOST_MODULE := true

include $(BUILD_DROIDDOC)

1 change: 0 additions & 1 deletion dx/tests/010-class-attrib-InnerClasses/small-class.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,3 @@ cafe babe # magic
0003 0000 0001 0002 # Small / null / "Small" / private
0003 0007 0000 0004 # Small / Zorch / null / protected
0007 0003 0006 ffff # Zorch / Small / "Zorch" / all-bits

1 change: 0 additions & 1 deletion dx/tests/021-code-attrib-LineNumberTable/info.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ dumping it.
The salient bit of parsing tested here is that the class has a single
method with a simple Code attribute, which itself has a syntactically
valid LineNumberTable attribute.

1 change: 0 additions & 1 deletion dx/tests/022-code-attrib-LocalVariableTable/info.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ dumping it.
The salient bit of parsing tested here is that the class has a single
method with a simple Code attribute, which itself has a syntactically
valid LocalVariableTable attribute.

1 change: 0 additions & 1 deletion dx/tests/023-code-exception-table/info.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ dumping it.
The salient bit of parsing tested here is that the class has a single
method with a minimal but syntactically valid Code attribute, which
sports a non-empty syntactically valid exception table.

1 change: 0 additions & 1 deletion dx/tests/028-class-attrib-EnclosingMethod/info.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ The salient bit of parsing tested here is that each class has a single
class-level EnclosingMethod attribute, which is syntactically valid. There
are two possible variants (method may be null), and this test contains one
of each.

1 change: 0 additions & 1 deletion dx/tests/031-bb-dead-code/blort.j
Original file line number Diff line number Diff line change
Expand Up @@ -180,4 +180,3 @@ blort:
blort:
return
.end method

1 change: 0 additions & 1 deletion dx/tests/032-bb-live-code/blort.j
Original file line number Diff line number Diff line change
Expand Up @@ -340,4 +340,3 @@ s3:
multianewarray [[[I 2
return
.end method

1 change: 0 additions & 1 deletion dx/tests/038-dex-instance-method/info.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ This is a smoke test of dex conversion, which ensures that the
conversion runs without failure, though the contents of the converted
file are not checked for correctness. This test is of a classfile with
just an instance method.

1 change: 0 additions & 1 deletion dx/tests/083-ssa-phi-placement/Blort.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,3 @@ public Object getOption(int optID) throws RuntimeException
}
}
}

2 changes: 0 additions & 2 deletions dx/tests/085-dex-jsr-ret/blort.j
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,3 @@ catchBlock:

.catch java/lang/Throwable from j2 to j2a using catchBlock
.end method


1 change: 0 additions & 1 deletion dx/tests/085-dex-jsr-ret/info.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
Tests handling of the Java jsr/jsr_w/ret bytecodes.

1 change: 0 additions & 1 deletion dx/tests/086-ssa-edge-split/Blort.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,3 @@ int edgeSplitSuccessor(int x) {
return y;
}
}

1 change: 0 additions & 1 deletion dx/tests/087-ssa-local-vars/Blort.java
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,3 @@ public static void parseHeaderGroup(
}
}
}

1 change: 0 additions & 1 deletion dx/tests/088-ssa-combine-blocks/Blort.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@ void infiniteLoop() {
}
}
}

1 change: 0 additions & 1 deletion dx/tests/091-ssa-const-collector/Blort.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,3 @@ void testNull(Object a) {

}
}

1 change: 0 additions & 1 deletion dx/tests/092-ssa-cfg-edge-cases/Blort.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ void testNoPrimarySuccessor() {
}
}
}

1 change: 0 additions & 1 deletion dx/tests/093-ssa-invoke-range/Blort.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,3 @@ long testMixedCategory(boolean foo) {
}
}
}

1 change: 0 additions & 1 deletion dx/tests/094-scala-locals/blort.j
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@ start:
end:
return
.end method

1 change: 0 additions & 1 deletion dx/tests/095-dex-const-string-jumbo/run
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@ function writeFile(name, start, end) {
$JAVAC -d . *.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test *.class

1 change: 0 additions & 1 deletion dx/tests/098-dex-jsr-ret-throw/info.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ The enclosed class file was generated with javac version 1.5.0_13-b05.
It contains an example of a subroutine being exited by a "throw" instruction in
such a way that it caused the frame merge and subroutine inliner
algorithms to not converge. This was bug #1137450.

1 change: 0 additions & 1 deletion dx/tests/104-verify-return-ops/run
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,3 @@ oneop sig_freturn
oneop sig_ireturn
oneop sig_lreturn
oneop sig_return

1 change: 0 additions & 1 deletion dx/tests/105-verify-load-store-ops/info.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
This tests that load and store opcodes verify that their arguments are
actually of the appropriate types.

1 change: 0 additions & 1 deletion dx/tests/111-use-null-as-array/Blort.java
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,3 @@ public static void test_setShortArray() {
arr[15] = (short) 16;
}
}

1 change: 0 additions & 1 deletion dx/tests/run-all-tests
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,3 @@ echo "failed: $failed test(s)"
for i in $failNames; do
echo "failed: $i"
done

1 change: 0 additions & 1 deletion libdex/DexFile.c
Original file line number Diff line number Diff line change
Expand Up @@ -1254,4 +1254,3 @@ void dexDecodeDebugInfo(
free(methodDescriptor);
}
}

1 change: 0 additions & 1 deletion libdex/DexInlines.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@
#include "InstrUtils.h"
#include "Leb128.h"
#include "ZipArchive.h"

1 change: 0 additions & 1 deletion libdex/DexProto.c
Original file line number Diff line number Diff line change
Expand Up @@ -531,4 +531,3 @@ const char* dexParameterIteratorNextDescriptor(

return dexStringByTypeIdx(pIterator->proto->dexFile, idx);
}

1 change: 0 additions & 1 deletion libdex/OptInvocation.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,3 @@ int dexOptCreateEmptyHeader(int fd)

return 0;
}

1 change: 0 additions & 1 deletion libdex/SysUtil.c
Original file line number Diff line number Diff line change
Expand Up @@ -406,4 +406,3 @@ int sysWriteFully(int fd, const void* buf, size_t count, const char* logMsg)

return 0;
}

1 change: 0 additions & 1 deletion libdex/ZipArchive.c
Original file line number Diff line number Diff line change
Expand Up @@ -745,4 +745,3 @@ int dexZipExtractEntryToFile(const ZipArchive* pArchive,
bail:
return result;
}

1 change: 0 additions & 1 deletion libnativehelper/README
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ class libraries. All code here:
- SHOULD be written in C rather than C++ where possible.

Some helper functions are defined in include/nativehelper/JNIHelp.h.

1 change: 0 additions & 1 deletion tests/003-omnibus-opcodes/build
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,3 @@ ${JAVAC} -d classes `find src2 -name '*.java'`

dx -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex classes
zip test.jar classes.dex

1 change: 0 additions & 1 deletion tests/003-omnibus-opcodes/src/Array.java
Original file line number Diff line number Diff line change
Expand Up @@ -222,4 +222,3 @@ public static void run() {
checkNegAlloc(-1);
}
}

1 change: 0 additions & 1 deletion tests/003-omnibus-opcodes/src/Compare.java
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,3 @@ public static void run() {
testDoubleCompare(-5.0, 4.0, 4.0, (1.0/0.0) / (1.0/0.0));
}
}

1 change: 0 additions & 1 deletion tests/003-omnibus-opcodes/src/FloatMath.java
Original file line number Diff line number Diff line change
Expand Up @@ -335,4 +335,3 @@ public static void run() {
jlmTests(3.14159f, 123456.78987654321);
}
}

1 change: 0 additions & 1 deletion tests/003-omnibus-opcodes/src/Goto.java
Original file line number Diff line number Diff line change
Expand Up @@ -2406,4 +2406,3 @@ public static void run() {
bigGoto(true);
}
};

1 change: 0 additions & 1 deletion tests/003-omnibus-opcodes/src/InstField.java
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,3 @@ public void checkFields() {
assert(mVolatileLong2 == -1234605616436508551L);
}
}

1 change: 0 additions & 1 deletion tests/003-omnibus-opcodes/src/IntMath.java
Original file line number Diff line number Diff line change
Expand Up @@ -490,4 +490,3 @@ public static void run() {
jlmTests(12345, 0x1122334455667788L);
}
}

1 change: 0 additions & 1 deletion tests/003-omnibus-opcodes/src/MethodCall.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,3 @@ int tryThing() {
return 7;
}
}

1 change: 0 additions & 1 deletion tests/003-omnibus-opcodes/src/Monitor.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@ public static void run() {
assert(mVal == 2);
}
}

1 change: 0 additions & 1 deletion tests/003-omnibus-opcodes/src/StaticField.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,3 @@ public static void checkFields() {
assert(mVolatileLong2 == -1234605616436508551L);
}
}

1 change: 0 additions & 1 deletion tests/003-omnibus-opcodes/src/Switch.java
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,3 @@ public static void run() {
testSwitch();
}
}

1 change: 0 additions & 1 deletion tests/003-omnibus-opcodes/src/Throw.java
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,3 @@ public static void run() {
th.rethrow();
}
}

1 change: 0 additions & 1 deletion tests/003-omnibus-opcodes/src/UnresClass.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@
public class UnresClass {
int foo;
}

1 change: 0 additions & 1 deletion tests/003-omnibus-opcodes/src/UnresStuff.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@ public static void staticMethod() {
System.out.println("unres!");
}
}

1 change: 0 additions & 1 deletion tests/003-omnibus-opcodes/src/UnresTest2.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,3 @@ public static void run() {
System.out.println("UnresTest2 done");
}
}

1 change: 0 additions & 1 deletion tests/003-omnibus-opcodes/src2/UnresStuff.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@
public class UnresStuff {
public int x;
}

Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@
double[] dd() default {0.987654321};
String[] str() default {};
}

Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@
public @interface AnnoFancyConstructor {
public int numArgs() default 0;
}

Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@
public @interface AnnoFancyField {
public String nombre() default "no se";
}

Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ enum AnnoFancyMethodEnum { FOO, BAR };
AnnoFancyMethodEnum enumerated() default AnnoFancyMethodEnum.FOO;
Class someClass() default SomeClass.class;
}

Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@
public @interface AnnoFancyParameter {
double factor();
}

Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@
public int num();
public String name() default "unknown";
}

Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@
@Retention(RetentionPolicy.RUNTIME)

public @interface AnnoSimpleConstructor {}

Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@
@Retention(RetentionPolicy.RUNTIME)

public @interface AnnoSimpleField {}

Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@
@Retention(RetentionPolicy.RUNTIME)

public @interface AnnoSimpleLocalVariable {}

Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@
@Retention(RetentionPolicy.RUNTIME)

public @interface AnnoSimpleMethod {}

Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@
@Retention(RetentionPolicy.RUNTIME)

public @interface AnnoSimplePackage {}

Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@
@Retention(RetentionPolicy.RUNTIME)

public @interface AnnoSimpleParameter {}

Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@
@Inherited
@Documented
public @interface AnnoSimpleType {}

Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@
@Retention(RetentionPolicy.RUNTIME)
@Inherited
public @interface AnnoSimpleType2 {}

Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@
@Retention(RetentionPolicy.CLASS)

public @interface AnnoSimpleTypeInvis {}

Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@
boolean resolveId() default false;
IntToString[] mapping() default { @IntToString(from = -1, to = "-1") };
}

Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,3 @@ public int notAnnotated() {
return 0;
}
}

1 change: 0 additions & 1 deletion tests/004-annotations/src/android/test/anno/INoted.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ public interface INoted {
@AnnoSimpleMethod
public int bar();
}

Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@
int from();
String to();
}

Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@ public int foo() {
return bar;
}
}

1 change: 0 additions & 1 deletion tests/004-annotations/src/android/test/anno/SomeClass.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@

public class SomeClass {
}

1 change: 0 additions & 1 deletion tests/004-annotations/src/android/test/anno/SubNoted.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@ public int bar() {
return 0;
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -175,4 +175,3 @@ public static void main(String[] args) {
System.out.println("SubNoted.get(AnnoSimpleType) = " + anno);
}
}

Loading

0 comments on commit 7365493

Please sign in to comment.