LineageOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Revert "Move error_code.h into otautil.""

Browse Source 
This reverts commit 26436d6d60 to re-land
"Move error_code.h into otautil.".

This way it stops requiring relative path ".." in LOCAL_C_INCLUDES
(uncrypt and edify). Soong doesn't accept non-local ".." in
"local_include_dirs".

This CL needs to land with device-specific module changes (e.g. adding
the dependency on libotautil).

Test: lunch aosp_{angler,bullhead,dragon,fugu,sailfish}-userdebug;
      mmma bootable/recovery
Change-Id: If193241801af2dae73eccd31ce57cd2b81c9fd96
This commit is contained in:
Tao Bao
2017-10-06 07:43:41 -07:00
parent 7a3fc2de8e
commit 1fc5bf353a
14 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
uncrypt/uncrypt.cpp
View File

@@ -116,7 +116,7 @@
#include <cutils/sockets.h>
#include <fs_mgr.h>
#include "error_code.h"
#include "otautil/error_code.h"
static constexpr int WINDOW_SIZE = 5;
static constexpr int FIBMAP_RETRY_LIMIT = 3;