Snap for 11724015 from 53e94b063b7c8038b406f116375047fbb12c5cc6 to sdk-releasesdk-release

Change-Id: Ie075dab09cabfebdf6d1349bd1639606a8e3d5af

2 files changed, 11 insertions, 6 deletions

diff --git a/Android.bp b/Android.bp
index 5a5b755..2cf4881 100644
--- a/Android.bp
+++ b/Android.bp
@@ -33,12 +33,18 @@ cc_library_static {
     ],
     local_include_dirs: ["userspace"],
 
-    // We don't enable branch/call/jump filters because they have no impact on
-    // Android OTA sizes (measured in http://b/329112384). The frequent
-    // function calls this is supposed to optimize will all go via the PLT, so
-    // the actual branch/call/jump instructions in the ELF file will be zeroed
-    // out anyway.
+    // We shouldn't enable branch/call/jump filters because they have no impact
+    // on Android OTA sizes (measured in http://b/329112384) --- the frequent
+    // function calls that this optimization is supposed to apply to will all go
+    // via the PLT, so the actual branch/call/jump instructions in the ELF file
+    // will be zeroed out anyway.
+    // Unfortunately, as long as we need to support decompressing _existing_
+    // OTA packages, we need to keep these in (but it's not worth adding new
+    // ones).
     cflags: [
+        "-DXZ_DEC_X86",
+        "-DXZ_DEC_ARM",
+        "-DXZ_DEC_ARMTHUMB",
         "-Wall",
         "-Werror",
     ],
diff --git a/NOTICE b/NOTICE
deleted file mode 120000
index d24842f..0000000
--- a/NOTICE
+++ /dev/null
@@ -1 +0,0 @@
-COPYING
\ No newline at end of file